diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2013-06-14 10:12:50 -0700 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2013-06-26 17:43:30 -0700 |
| commit | a44a4d32ff12bf6826be528eca13259d839b78d6 (patch) | |
| tree | 9e8225c9b064521adc19bb35d18ff9c59f658e8c /generic/include/clc/shared/min.inc | |
| parent | 3a4d22ab84ce975bd98f9961ccba8ed8665c3c5f (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/min.inc')
| -rw-r--r-- | generic/include/clc/shared/min.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/include/clc/shared/min.inc b/generic/include/clc/shared/min.inc index cf3afaf..d8c1568 100644 --- a/generic/include/clc/shared/min.inc +++ b/generic/include/clc/shared/min.inc @@ -1,5 +1,5 @@ -_CLC_OVERLOAD _CLC_DECL GENTYPE min(GENTYPE a, GENTYPE b); +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_GENTYPE b); -#ifndef SCALAR -_CLC_OVERLOAD _CLC_DECL GENTYPE min(GENTYPE a, SCALAR_GENTYPE b); -#endif
\ No newline at end of file +#ifndef __CLC_SCALAR +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b); +#endif |