summaryrefslogtreecommitdiffstats
path: root/src/gallium/include
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2011-09-07 18:42:07 +0100
committerJosé Fonseca <[email protected]>2011-09-08 09:17:42 +0100
commit1cf808c86e7e88b173a5ca0ec6fef562ecae16b3 (patch)
tree35bfc4f852896d6865863d67a98f3a9c1567baa6 /src/gallium/include
parent7645c49e07b638de94f03d5f71fde397066a46ee (diff)
Define INLINE macro in terms of inline.
Diffstat (limited to 'src/gallium/include')
-rw-r--r--src/gallium/include/pipe/p_compiler.h25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index 05de9ff7cd0..6ac36447638 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