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>
llvm-svn: 185838

7 files changed, 12 insertions, 12 deletions

diff --git a/libclc/generic/lib/math/binary_impl.inc b/libclc/generic/lib/math/binary_impl.inc
index e4b1e5ff515..83872d2d78c 100644
--- a/libclc/generic/lib/math/binary_impl.inc
+++ b/libclc/generic/lib/math/binary_impl.inc
@@ -1,18 +1,18 @@
 
-#ifndef SCALAR
+#ifndef __CLC_SCALAR
 
-_CLC_OVERLOAD _CLC_DEF GENTYPE FUNCTION(GENTYPE x, GENTYPE y) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE x, __CLC_GENTYPE y) {
   return FUNCTION_IMPL(x, y);
 }
 
 #endif
 
-_CLC_OVERLOAD _CLC_DEF GENTYPE FUNCTION(GENTYPE x, double y) {
-  GENTYPE vec_y = (GENTYPE) (y);
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE x, double y) {
+  __CLC_GENTYPE vec_y = (__CLC_GENTYPE) (y);
   return FUNCTION_IMPL(x, vec_y);
 }
 
-_CLC_OVERLOAD _CLC_DEF GENTYPE FUNCTION(GENTYPE x, float y) {
-  GENTYPE vec_y = (GENTYPE) (y);
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE x, float y) {
+  __CLC_GENTYPE vec_y = (__CLC_GENTYPE) (y);
   return FUNCTION_IMPL(x, vec_y);
 }
diff --git a/libclc/generic/lib/math/fmax.cl b/libclc/generic/lib/math/fmax.cl
index 68a67acd34c..58583d6767a 100644
--- a/libclc/generic/lib/math/fmax.cl
+++ b/libclc/generic/lib/math/fmax.cl
@@ -7,5 +7,5 @@
 #define FUNCTION __clc_fmax
 #define FUNCTION_IMPL(x, y) ((x) < (y) ? (y) : (x))
 
-#define BODY <binary_impl.inc>
+#define __CLC_BODY <binary_impl.inc>
 #include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/fmin.cl b/libclc/generic/lib/math/fmin.cl
index cac188e94c3..a61ad475728 100644
--- a/libclc/generic/lib/math/fmin.cl
+++ b/libclc/generic/lib/math/fmin.cl
@@ -7,5 +7,5 @@
 #define FUNCTION __clc_fmin
 #define FUNCTION_IMPL(x, y) ((y) < (x) ? (y) : (x))
 
-#define BODY <binary_impl.inc>
+#define __CLC_BODY <binary_impl.inc>
 #include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/hypot.cl b/libclc/generic/lib/math/hypot.cl
index dcdc1edddd0..eca042c9153 100644
--- a/libclc/generic/lib/math/hypot.cl
+++ b/libclc/generic/lib/math/hypot.cl
@@ -4,5 +4,5 @@
 #pragma OPENCL EXTENSION cl_khr_fp64 : enable
 #endif
 
-#define BODY <hypot.inc>
+#define __CLC_BODY <hypot.inc>
 #include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/hypot.inc b/libclc/generic/lib/math/hypot.inc
index 3f529c881a4..036cee7e1f0 100644
--- a/libclc/generic/lib/math/hypot.inc
+++ b/libclc/generic/lib/math/hypot.inc
@@ -1,3 +1,3 @@
-_CLC_OVERLOAD _CLC_DEF GENTYPE hypot(GENTYPE x, GENTYPE y) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE hypot(__CLC_GENTYPE x, __CLC_GENTYPE y) {
   return sqrt(x*x + y*y);
 }
diff --git a/libclc/generic/lib/math/mad.cl b/libclc/generic/lib/math/mad.cl
index e66e2046bb9..6c7b90d150d 100644
--- a/libclc/generic/lib/math/mad.cl
+++ b/libclc/generic/lib/math/mad.cl
@@ -4,5 +4,5 @@
 #pragma OPENCL EXTENSION cl_khr_fp64 : enable
 #endif
 
-#define BODY <mad.inc>
+#define __CLC_BODY <mad.inc>
 #include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/mad.inc b/libclc/generic/lib/math/mad.inc
index aec9c06ddd8..d32c7839d1b 100644
--- a/libclc/generic/lib/math/mad.inc
+++ b/libclc/generic/lib/math/mad.inc
@@ -1,3 +1,3 @@
-_CLC_OVERLOAD _CLC_DEF GENTYPE mad(GENTYPE a, GENTYPE b, GENTYPE c) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE mad(__CLC_GENTYPE a, __CLC_GENTYPE b, __CLC_GENTYPE c) {
   return a * b + c;
 }