AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Add an ifndef guard around the definition of the INLINE macro

Browse Source 
Several Mesa headers redundantly define the INLINE macro.  Adding this
guard prevents the compiler from complaining about macro redefinition.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad@chad-versace.us>
This commit is contained in:
Paul Berry
2011-07-07 13:03:45 -07:00
parent a87afba505
commit 12c22cab77
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/compiler.h
+22 -20
View File
@@ -139,26 +139,28 @@ extern "C" {
/**
* Function inlining
*/
#if defined(__GNUC__)
# define INLINE __inline__
#elif defined(__MSC__)
# define INLINE __inline
#elif defined(_MSC_VER)
# define INLINE __inline
#elif defined(__ICL)
# define INLINE __inline
#elif defined(__INTEL_COMPILER)
# define INLINE inline
#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
# define INLINE __inline
#elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
# define INLINE inline
# define __inline inline
# define __inline__ inline
#elif (__STDC_VERSION__ >= 199901L) /* C99 */
# define INLINE inline
#else
# define INLINE
#ifndef INLINE
# if defined(__GNUC__)
# define INLINE __inline__
# elif defined(__MSC__)
# define INLINE __inline
# elif defined(_MSC_VER)
# define INLINE __inline
# elif defined(__ICL)
# define INLINE __inline
# elif defined(__INTEL_COMPILER)
# define INLINE inline
# elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
# define INLINE __inline
# elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
# define INLINE inline
# define __inline inline
# define __inline__ inline
# elif (__STDC_VERSION__ >= 199901L) /* C99 */
# define INLINE inline
# else
# define INLINE
# endif
#endif