aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2003-12-09 23:59:16 +0000
committerEric Anholt <[email protected]>2003-12-09 23:59:16 +0000
commit527078afcaf27fc517ce3029e623235fa381877b (patch)
tree2f68838313da15c95fb25dc714ff3e8533e9209a
parentb44fb3577089d4cab7d0f3ff87c6d9f4a7c42a35 (diff)
Fix definitions for Intel compiler.
Submitted by: Mikhail Teterin <[email protected]>
-rw-r--r--src/mesa/main/glheader.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 952a62d3fa5..78b20f809d2 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -228,7 +228,7 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
* than GNU C
*/
#ifndef _ASMAPI
-#if !defined( __GNUC__ ) && !defined( VMS )
+#if !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )
#define _ASMAPI __cdecl
#else
#define _ASMAPI
@@ -258,6 +258,8 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
# define INLINE __inline
#elif defined(__ICL)
# define INLINE __inline
+#elif defined(__INTEL_COMPILER)
+# define INLINE inline
#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
# define INLINE __inline
#else