diff --git a/framework/Source/GPUImageCrosshairGenerator.m b/framework/Source/GPUImageCrosshairGenerator.m index a2f1d70e7..f127dac33 100644 --- 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 index a2fef68f6..e6d8da81f 100755 --- 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;