From 1cf808c86e7e88b173a5ca0ec6fef562ecae16b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 7 Sep 2011 18:42:07 +0100 Subject: Define INLINE macro in terms of inline. --- src/gallium/include/pipe/p_compiler.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 05de9ff..6ac3644 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -91,27 +91,30 @@ typedef unsigned char boolean; #endif /* Function inlining */ -#ifndef INLINE +#ifndef inline # ifdef __cplusplus -# define INLINE inline + /* C++ supports inline keyword */ # elif defined(__GNUC__) -# define INLINE __inline__ +# define inline __inline__ # elif defined(_MSC_VER) -# define INLINE __inline +# define inline __inline # elif defined(__ICL) -# define INLINE __inline +# define inline __inline # elif defined(__INTEL_COMPILER) -# define INLINE inline + /* Intel compiler supports inline keyword */ # elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100) -# define INLINE __inline +# define inline __inline # elif defined(__SUNPRO_C) && defined(__C99FEATURES__) -# define INLINE inline -# elif (__STDC_VERSION__ >= 199901L) /* C99 */ -# define INLINE inline + /* C99 supports inline keyword */ +# elif (__STDC_VERSION__ >= 199901L) + /* C99 supports inline keyword */ # else -# define INLINE +# define inline # endif #endif +#ifndef INLINE +# define INLINE inline +#endif /* Forced function inlining */ #ifndef ALWAYS_INLINE -- cgit v1.1