aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-09 08:40:24 +0200
committermarha <marha@users.sourceforge.net>2011-09-09 08:40:24 +0200
commitf9cf11136d65f20aab4fb6d5fc3ec3c59185a0b4 (patch)
treef64cc9b70b0e0d7212d3b1e64f804a3dbc6cfa3b /mesalib/src/mapi
parent23a7aebae0a742d94ffe2304357dcc1234a99155 (diff)
downloadvcxsrv-f9cf11136d65f20aab4fb6d5fc3ec3c59185a0b4.tar.gz
vcxsrv-f9cf11136d65f20aab4fb6d5fc3ec3c59185a0b4.tar.bz2
vcxsrv-f9cf11136d65f20aab4fb6d5fc3ec3c59185a0b4.zip
mesa git update 9 sep 2011
Diffstat (limited to 'mesalib/src/mapi')
-rw-r--r--mesalib/src/mapi/mapi/u_compiler.h25
1 files changed, 14 insertions, 11 deletions
diff --git a/mesalib/src/mapi/mapi/u_compiler.h b/mesalib/src/mapi/mapi/u_compiler.h
index f1752d16f..2b019ed15 100644
--- a/mesalib/src/mapi/mapi/u_compiler.h
+++ b/mesalib/src/mapi/mapi/u_compiler.h
@@ -2,27 +2,30 @@
#define _U_COMPILER_H_
/* 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
/* Function visibility */
#ifndef PUBLIC