/*
* Mesa 3-D graphics library
- * Version: 5.1
+ * Version: 6.1
*
- * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
# 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(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !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
#endif
-/*
- * Provide a reasonable replacement for __FUNCTION__ when using
- * non-GNU C compilers. Watcom C/C++ 11.0 and later provide this also.
- */
-#if !defined(__GNUC__) && !(defined(__WATCOMC__) && (__WATCOMC__ >= 1100))
-#define STRINGIZE(x) #x
-#define STRINGIZE_EVAL(x) STRINGIZE(x)
-#define __FUNCTION__ STRINGIZE_EVAL(__FILE__) ", line " STRINGIZE_EVAL(__LINE__)
-#endif
-
-
/* Some compilers don't like some of Mesa's const usage */
#ifdef NO_CONST
# define CONST