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 | |
| 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')
| -rw-r--r-- | generic/include/clc/shared/clamp.h | 4 | ||||
| -rw-r--r-- | generic/include/clc/shared/clamp.inc | 6 | ||||
| -rw-r--r-- | generic/include/clc/shared/max.h | 4 | ||||
| -rw-r--r-- | generic/include/clc/shared/max.inc | 6 | ||||
| -rw-r--r-- | generic/include/clc/shared/min.h | 4 | ||||
| -rw-r--r-- | generic/include/clc/shared/min.inc | 8 |
6 files changed, 16 insertions, 16 deletions
diff --git a/generic/include/clc/shared/clamp.h b/generic/include/clc/shared/clamp.h index 5c2ebd0..a389b85 100644 --- a/generic/include/clc/shared/clamp.h +++ b/generic/include/clc/shared/clamp.h @@ -1,5 +1,5 @@ -#define BODY <clc/shared/clamp.inc> +#define __CLC_BODY <clc/shared/clamp.inc> #include <clc/integer/gentype.inc> -#define BODY <clc/shared/clamp.inc> +#define __CLC_BODY <clc/shared/clamp.inc> #include <clc/math/gentype.inc> diff --git a/generic/include/clc/shared/clamp.inc b/generic/include/clc/shared/clamp.inc index 67c8142..aaff9d0 100644 --- a/generic/include/clc/shared/clamp.inc +++ b/generic/include/clc/shared/clamp.inc @@ -1,5 +1,5 @@ -_CLC_OVERLOAD _CLC_DECL GENTYPE clamp(GENTYPE x, GENTYPE y, GENTYPE z); +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE clamp(__CLC_GENTYPE x, __CLC_GENTYPE y, __CLC_GENTYPE z); -#ifndef SCALAR -_CLC_OVERLOAD _CLC_DECL GENTYPE clamp(GENTYPE x, SCALAR_GENTYPE y, SCALAR_GENTYPE z); +#ifndef __CLC_SCALAR +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE clamp(__CLC_GENTYPE x, __CLC_SCALAR_GENTYPE y, __CLC_SCALAR_GENTYPE z); #endif diff --git a/generic/include/clc/shared/max.h b/generic/include/clc/shared/max.h index 7967d4a..ee20b9e 100644 --- a/generic/include/clc/shared/max.h +++ b/generic/include/clc/shared/max.h @@ -1,5 +1,5 @@ -#define BODY <clc/shared/max.inc> +#define __CLC_BODY <clc/shared/max.inc> #include <clc/integer/gentype.inc> -#define BODY <clc/shared/max.inc> +#define __CLC_BODY <clc/shared/max.inc> #include <clc/math/gentype.inc> diff --git a/generic/include/clc/shared/max.inc b/generic/include/clc/shared/max.inc index 9fe73c4..5901074 100644 --- a/generic/include/clc/shared/max.inc +++ b/generic/include/clc/shared/max.inc @@ -1,5 +1,5 @@ -_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, GENTYPE b); +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE max(__CLC_GENTYPE a, __CLC_GENTYPE b); -#ifndef SCALAR -_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, SCALAR_GENTYPE b); +#ifndef __CLC_SCALAR +_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE max(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b); #endif diff --git a/generic/include/clc/shared/min.h b/generic/include/clc/shared/min.h index e16b45d..e11d9f9 100644 --- a/generic/include/clc/shared/min.h +++ b/generic/include/clc/shared/min.h @@ -1,5 +1,5 @@ -#define BODY <clc/shared/min.inc> +#define __CLC_BODY <clc/shared/min.inc> #include <clc/integer/gentype.inc> -#define BODY <clc/shared/min.inc> +#define __CLC_BODY <clc/shared/min.inc> #include <clc/math/gentype.inc> 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 |