From d768ac0395f7f9e2146f9522b3a120f379a1a934 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 8 Jul 2013 17:27:02 +0000 Subject: 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 llvm-svn: 185838 --- libclc/generic/lib/math/binary_impl.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libclc/generic/lib/math/binary_impl.inc') 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); } -- cgit v1.2.3