diff options
| author | José Fonseca <[email protected]> | 2013-03-12 11:17:49 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2013-03-12 22:06:27 +0000 |
| commit | 70fe7c6d3e1c7534f6598c4616bebf672f42668b (patch) | |
| tree | 4a89950745ecc8218682fde97d70dfff26f97928 /src/mapi | |
| parent | 96b3ca89b153f358de74059151d2b0e8bd884dfa (diff) | |
mesa,gallium,egl,mapi: One definition of C99 inline/__func__ to rule them all.
We were in four already...
NOTE: Candidate for the stable branches.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/mapi/u_compiler.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/mapi/mapi/u_compiler.h b/src/mapi/mapi/u_compiler.h index 2b019ed15b0..f376e97a0f3 100644 --- a/src/mapi/mapi/u_compiler.h +++ b/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 |