diff options
| author | José Fonseca <jfonseca@vmware.com> | 2008-12-30 17:14:48 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2008-12-30 17:14:48 +0000 |
| commit | b3b7c757a9873007ee033693b06647b378301075 (patch) | |
| tree | 1387e6e56ba574845dfff04c91df96417803da70 /src/gallium/include | |
| parent | 975e58499a07775e071c2517b4fa21306e8349bb (diff) | |
gallium: Don't redefine INLINE.
INLINE is commonly used in third-party headers.
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_compiler.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 7bcebd3d6b..02a075d384 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -112,20 +112,22 @@ typedef unsigned char boolean; /* Function inlining */ -#ifdef __cplusplus -# define INLINE inline -#elif defined(__GNUC__) -# 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 -#else -# define INLINE +#ifndef INLINE +# ifdef __cplusplus +# define INLINE inline +# elif defined(__GNUC__) +# 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 +# else +# define INLINE +# endif #endif |