[Libclc-dev] [PATCH 2/2] Add missing undefs

[Tom Stellard]

On Tue, Jun 17, 2014 at 03:28:57PM +0100, Jeroen Ketema wrote:
> There are probably a few other places where this would be preferable in the header files.
> 

LGTM.

> I’m also wondering whether clcmacro.h should maybe be moved from include/clc to lib/. It’s only used in lib and polluting the user’s namespace.
> 

Yes, let's move it.

-Tom

> ---
> generic/include/clc/relational/all.h     | 4 +++-
> generic/include/clc/relational/isequal.h | 6 ++++--
> 2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/generic/include/clc/relational/all.h b/generic/include/clc/relational/all.h
> index f917419..f8b0942 100644
> --- a/generic/include/clc/relational/all.h
> +++ b/generic/include/clc/relational/all.h
> @@ -1,4 +1,3 @@
> -
> #define _CLC_ALL_DECL(TYPE) \
>   _CLC_OVERLOAD _CLC_DECL int all(TYPE v);
> 
> @@ -14,3 +13,6 @@ _CLC_VECTOR_ALL_DECL(char)
> _CLC_VECTOR_ALL_DECL(short)
> _CLC_VECTOR_ALL_DECL(int)
> _CLC_VECTOR_ALL_DECL(long)
> +
> +#undef _CLC_ALL_DECL
> +#undef _CLC_VECTOR_ALL_DECL
> diff --git a/generic/include/clc/relational/isequal.h b/generic/include/clc/relational/isequal.h
> index 6f7b3aa..c28a985 100644
> --- a/generic/include/clc/relational/isequal.h
> +++ b/generic/include/clc/relational/isequal.h
> @@ -1,4 +1,3 @@
> -
> #define _CLC_ISEQUAL_DECL(TYPE, RETTYPE) \
>   _CLC_OVERLOAD _CLC_DECL RETTYPE isequal(TYPE x, TYPE y);
> 
> @@ -15,4 +14,7 @@ _CLC_VECTOR_ISEQUAL_DECL(float, int)
> #ifdef cl_khr_fp64
> _CLC_ISEQUAL_DECL(double, int)
> _CLC_VECTOR_ISEQUAL_DECL(double, long)
> -#endif
> \ No newline at end of file
> +#endif
> +
> +#undef _CLC_ISEQUAL_DECL
> +#undef _CLC_VECTOR_ISEQUAL_DEC
> -- 
> 1.8.5.2 (Apple Git-48)
> 
> 
> _______________________________________________
> Libclc-dev mailing list
> Libclc-dev at pcc.me.uk
> http://www.pcc.me.uk/cgi-bin/mailman/listinfo/libclc-dev