#endif
-#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
# define __WIN32__
# define finite _finite
#endif
-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
+#if defined(__WATCOMC__)
+# define finite _finite
+#endif
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
# pragma warning( disable : 4068 ) /* unknown pragma */
# pragma warning( disable : 4710 ) /* function 'foo' not inlined */
# pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
# 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
# endif
# define GLWINAPI __stdcall
# define GLWINAPIV __cdecl
-#elif !defined(__SCITECH_SNAP__)
+#elif !defined(BUILD_FOR_SNAP)
/* non-Windows compilation */
# define GLAPI extern
# define GLAPIENTRY
-# define GLAPIENTRYP *
+# ifndef GLAPIENTRYP
+# define GLAPIENTRYP *
+# endif
# define GLCALLBACK
# define GLCALLBACKP *
# define GLCALLBACKPCAST *
/* compatibility guard so we don't need to change client code */
-#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_WINDEF_H) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_WINDEF_H) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
#if 0
# define CALLBACK GLCALLBACK
typedef void *HGLRC;
#define GL_GLEXT_PROTOTYPES
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WINGDI_H) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WINGDI_H) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(BUILD_FOR_SNAP)
# define WGL_FONT_LINES 0
# define WGL_FONT_POLYGONS 1
#ifndef _GNU_H_WINDOWS32_FUNCTIONS
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
#ifndef CAPI
-#ifdef WIN32
+#if defined(WIN32) && !defined(BUILD_FOR_SNAP)
#define CAPI _cdecl
#else
#define CAPI
* 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
#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
#endif
-#if defined(__SCITECH_SNAP__) && defined(CHECKED)
+#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
# define ASSERT(X) _CHECK(X)
#elif defined(DEBUG)
# define ASSERT(X) assert(X)