From a1503b00f863a48a517939a42d512f9cfe77f79c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 16 Jul 2001 15:54:23 +0000
Subject: Various 16-bit GLchan fixes and Win32 fixes (Gerk Huisma)

---
 src/mesa/main/glheader.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main/glheader.h')

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 596bd2d01e..41c4742040 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
-- 
cgit v1.2.3