diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-18 16:33:08 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-18 16:33:08 +0100 |
| commit | 9c17f511266fff48a936633de280f271f0ce0c11 (patch) | |
| tree | d34a68ecb0949f09e997031c66e1a3024903e3c8 /mesalib/src/mapi | |
| parent | 514e0809a42027e2178bf0eccd526a08da60f399 (diff) | |
| download | vcxsrv-9c17f511266fff48a936633de280f271f0ce0c11.tar.gz vcxsrv-9c17f511266fff48a936633de280f271f0ce0c11.tar.bz2 vcxsrv-9c17f511266fff48a936633de280f271f0ce0c11.zip | |
libX11 mesa git update 18 Mar 2013
libX11 commit f49bb2dd6d4ea45c55bd21acc0efe2b764441020
mesa commit 2da8ee16a8b126d15f34552916c77b203be326db
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/mapi/u_compiler.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/mesalib/src/mapi/mapi/u_compiler.h b/mesalib/src/mapi/mapi/u_compiler.h index 2b019ed15..f376e97a0 100644 --- a/mesalib/src/mapi/mapi/u_compiler.h +++ b/mesalib/src/mapi/mapi/u_compiler.h @@ -1,28 +1,10 @@ #ifndef _U_COMPILER_H_ #define _U_COMPILER_H_ -/* Function inlining */ -#ifndef inline -# ifdef __cplusplus - /* C++ supports inline keyword */ -# elif defined(__GNUC__) -# define inline __inline__ -# elif defined(_MSC_VER) -# define inline __inline -# elif defined(__ICL) -# define inline __inline -# elif defined(__INTEL_COMPILER) - /* Intel compiler supports inline keyword */ -# elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100) -# define inline __inline -# elif defined(__SUNPRO_C) && defined(__C99FEATURES__) - /* C99 supports inline keyword */ -# elif (__STDC_VERSION__ >= 199901L) - /* C99 supports inline keyword */ -# else -# define inline -# endif -#endif +#include "c99_compat.h" /* inline, __func__, etc. */ + + +/* XXX: Use standard `inline` keyword instead */ #ifndef INLINE # define INLINE inline #endif |