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

1 files changed, 6 insertions, 6 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);
 }