From 527078afcaf27fc517ce3029e623235fa381877b Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 9 Dec 2003 23:59:16 +0000 Subject: [PATCH] Fix definitions for Intel compiler. Submitted by: Mikhail Teterin --- src/mesa/main/glheader.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.30.2