# define WGLAPI __declspec(dllimport)
# endif /* _STATIC_MESA support */
# define GLAPIENTRY __stdcall
-# define GLAPIENTRYP __stdcall *
+# define GLAPIENTRYP GLAPIENTRY *
# define GLCALLBACK __stdcall
-# define GLCALLBACKP __stdcall *
+# define GLCALLBACKP GLCALLBACK *
# if defined(__CYGWIN__)
# define GLCALLBACKPCAST *
# else
/* non-Windows compilation */
# define GLAPI extern
# define GLAPIENTRY
-# define GLAPIENTRYP *
+# ifndef GLAPIENTRYP
+# define GLAPIENTRYP *
+# endif
# define GLCALLBACK
# define GLCALLBACKP *
# define GLCALLBACKPCAST *
typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
#if !defined(GLX_USE_MESA)
-#include <gl/mesa_wgl.h>
+#include <GL/mesa_wgl.h>
#endif
#endif
* than GNU C
*/
#ifndef _ASMAPI
-#if !defined( __GNUC__ ) && !defined( VMS )
+#if !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )
#define _ASMAPI __cdecl
#else
#define _ASMAPI
# 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