summaryrefslogtreecommitdiff
path: root/generic/include/clc/shared/clamp.inc
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2013-06-14 10:12:50 -0700
committerTom Stellard <thomas.stellard@amd.com>2013-06-26 17:43:30 -0700
commita44a4d32ff12bf6826be528eca13259d839b78d6 (patch)
tree9e8225c9b064521adc19bb35d18ff9c59f658e8c /generic/include/clc/shared/clamp.inc
parent3a4d22ab84ce975bd98f9961ccba8ed8665c3c5f (diff)
Add __CLC_ prefix to all macro definitions in headers
libclc was defining and undefing GENTYPE and several other macros with common names in its header files. This was preventing applications from defining macros with identical names as command line arguments to the compiler, because the definitions in the header files were masking the macros defined as compiler arguements. Reviewed-by: Aaron Watry <awatry@gmail.com>
Diffstat (limited to 'generic/include/clc/shared/clamp.inc')
-rw-r--r--generic/include/clc/shared/clamp.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/include/clc/shared/clamp.inc b/generic/include/clc/shared/clamp.inc
index 67c8142..aaff9d0 100644
--- a/generic/include/clc/shared/clamp.inc
+++ b/generic/include/clc/shared/clamp.inc
@@ -1,5 +1,5 @@
-_CLC_OVERLOAD _CLC_DECL GENTYPE clamp(GENTYPE x, GENTYPE y, GENTYPE z);
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE clamp(__CLC_GENTYPE x, __CLC_GENTYPE y, __CLC_GENTYPE z);
-#ifndef SCALAR
-_CLC_OVERLOAD _CLC_DECL GENTYPE clamp(GENTYPE x, SCALAR_GENTYPE y, SCALAR_GENTYPE z);
+#ifndef __CLC_SCALAR
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE clamp(__CLC_GENTYPE x, __CLC_SCALAR_GENTYPE y, __CLC_SCALAR_GENTYPE z);
#endif