diff options
| author | Brian Paul <[email protected]> | 2001-07-16 15:54:23 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2001-07-16 15:54:23 +0000 |
| commit | a1503b00f863a48a517939a42d512f9cfe77f79c (patch) | |
| tree | cf8be4ed948b2e97160482c1b7cf4164b8ef9b0b /src/mesa/main/glheader.h | |
| parent | fba5e9546874e1e140a3862b31e35b68832cc22d (diff) | |
Various 16-bit GLchan fixes and Win32 fixes (Gerk Huisma)
Diffstat (limited to 'src/mesa/main/glheader.h')
| -rw-r--r-- | src/mesa/main/glheader.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 596bd2d01ee..41c47420409 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -1,4 +1,4 @@ -/* $Id: glheader.h,v 1.21 2001/06/15 15:22:07 brianp Exp $ */ +/* $Id: glheader.h,v 1.22 2001/07/16 15:54:23 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -173,8 +173,12 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC #ifndef CAPI +#ifdef WIN32 +#define CAPI _cdecl +#else #define CAPI #endif +#endif #include <GL/internal/glcore.h> @@ -221,6 +225,10 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC # define INLINE __inline__ #elif defined(__MSC__) # define INLINE __inline +#elif defined(_MSC_VER) +# define INLINE __inline +#elif defined(__ICL) +# define INLINE __inline #else # define INLINE #endif |