From 5217211f119b1ddef4d541431c73a7ab7315636e 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 git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@185838 91177308-0d34-0410-b5e6-96231b3b80d8 --- generic/lib/integer/abs_diff.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'generic/lib/integer/abs_diff.inc') diff --git a/generic/lib/integer/abs_diff.inc b/generic/lib/integer/abs_diff.inc index 6ad57ee..f39c3ff 100644 --- a/generic/lib/integer/abs_diff.inc +++ b/generic/lib/integer/abs_diff.inc @@ -1,3 +1,3 @@ -_CLC_OVERLOAD _CLC_DEF UGENTYPE abs_diff(GENTYPE x, GENTYPE y) { - return __builtin_astype((GENTYPE)(x > y ? x-y : y-x), UGENTYPE); +_CLC_OVERLOAD _CLC_DEF __CLC_U_GENTYPE abs_diff(__CLC_GENTYPE x, __CLC_GENTYPE y) { + return __builtin_astype((__CLC_GENTYPE)(x > y ? x-y : y-x), __CLC_U_GENTYPE); } -- cgit v1.2.3