Fixed some poorly-named macros that were conflicting with other frame…

…works.
kcoop · Jun 14, 2013 · 3f5c9ce · 3f5c9ce
1 parent ac88d0e
commit 3f5c9ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/framework/Source/GPUImageCrosshairGenerator.m b/framework/Source/GPUImageCrosshairGenerator.m
@@ -38,7 +38,7 @@ void main()
 #else
 NSString *const kGPUImageCrosshairFragmentShaderString = SHADER_STRING
 (
- escapedhash(version 120)\n
+ GPUImageEscapedHashIdentifier(version 120)\n
 
  uniform vec3 crosshairColor;
 

diff --git a/framework/Source/GPUImageFilter.h b/framework/Source/GPUImageFilter.h
@@ -4,9 +4,9 @@
 #define STRINGIZE2(x) STRINGIZE(x)
 #define SHADER_STRING(text) @ STRINGIZE2(text)
 
-#define hash #
-#define wrappedlabel(x) x
-#define escapedhash(a) wrappedlabel(hash)a
+#define GPUImageHashIdentifier #
+#define GPUImageWrappedLabel(x) x
+#define GPUImageEscapedHashIdentifier(a) GPUImageWrappedLabel(GPUImageHashIdentifier)a
 
 extern NSString *const kGPUImageVertexShaderString;
 extern NSString *const kGPUImagePassthroughFragmentShaderString;