[Mesa-dev] [PATCH 1/4] mesa: Add an ifndef guard around the definition of the INLINE macro

[Brian Paul]

On 07/18/2011 12:37 PM, Paul Berry wrote:
> Several headers redundantly define the INLINE macro.  Adding this
> guard prevents the compiler from complaining about macro redefinition.

Other Mesa headers?  Or system headers?  Or?

Reviewed-by: Brian Paul <brianp at vmware.com>


> ---
>   src/mesa/main/compiler.h |   42 ++++++++++++++++++++++--------------------
>   1 files changed, 22 insertions(+), 20 deletions(-)
>
> diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
> index 743841b..d736fdf 100644
> --- a/src/mesa/main/compiler.h
> +++ b/src/mesa/main/compiler.h
> @@ -139,26 +139,28 @@ extern "C" {
>   /**
>    * Function inlining
>    */
> -#if defined(__GNUC__)
> -#  define INLINE __inline__
> -#elif defined(__MSC__)
> -#  define INLINE __inline
> -#elif defined(_MSC_VER)
> -#  define INLINE __inline
> -#elif defined(__ICL)
> -#  define INLINE __inline
> -#elif defined(__INTEL_COMPILER)
> -#  define INLINE inline
> -#elif defined(__WATCOMC__)&&  (__WATCOMC__>= 1100)
> -#  define INLINE __inline
> -#elif defined(__SUNPRO_C)&&  defined(__C99FEATURES__)
> -#  define INLINE inline
> -#  define __inline inline
> -#  define __inline__ inline
> -#elif (__STDC_VERSION__>= 199901L) /* C99 */
> -#  define INLINE inline
> -#else
> -#  define INLINE
> +#ifndef INLINE
> +#  if defined(__GNUC__)
> +#    define INLINE __inline__
> +#  elif defined(__MSC__)
> +#    define INLINE __inline
> +#  elif defined(_MSC_VER)
> +#    define INLINE __inline
> +#  elif defined(__ICL)
> +#    define INLINE __inline
> +#  elif defined(__INTEL_COMPILER)
> +#    define INLINE inline
> +#  elif defined(__WATCOMC__)&&  (__WATCOMC__>= 1100)
> +#    define INLINE __inline
> +#  elif defined(__SUNPRO_C)&&  defined(__C99FEATURES__)
> +#    define INLINE inline
> +#    define __inline inline
> +#    define __inline__ inline
> +#  elif (__STDC_VERSION__>= 199901L) /* C99 */
> +#    define INLINE inline
> +#  else
> +#    define INLINE
> +#  endif
>   #endif
>
>