summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/GL/gl.h2
-rw-r--r--include/GL/glext.h8
-rw-r--r--include/GL/glxext.h6
-rw-r--r--include/GLES/glplatform.h6
-rw-r--r--include/GLES2/gl2platform.h6
5 files changed, 18 insertions, 10 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index c0cebec2efa..c9ef6136fab 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -58,7 +58,7 @@
# else /* for use with static link lib build of Win32 edition only */
# define GLAPI extern
# endif /* _STATIC_MESA support */
-# if defined(__MINGW32__) && defined(GL_NO_STDCALL) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
+# if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
# define GLAPIENTRY
# else
# define GLAPIENTRY __stdcall
diff --git a/include/GL/glext.h b/include/GL/glext.h
index 2519a6cc5e1..6ecb44affb4 100644
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -3416,16 +3416,16 @@ typedef unsigned short GLhalfNV;
#endif
#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glext.h, so must be protected */
+/* This code block is duplicated in glxext.h, so must be protected */
#define GLEXT_64_TYPES_DEFINED
/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
/* (as used in the GL_EXT_timer_query extension). */
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#include <inttypes.h>
-#elif defined(__sun__)
+#elif defined(__sun__) || defined(__digital__)
#include <inttypes.h>
#if defined(__STDC__)
-#if defined(__arch64__)
+#if defined(__arch64__) || defined(_LP64)
typedef long int int64_t;
typedef unsigned long int uint64_t;
#else
@@ -3433,7 +3433,7 @@ typedef long long int int64_t;
typedef unsigned long long int uint64_t;
#endif /* __arch64__ */
#endif /* __STDC__ */
-#elif defined( __VMS )
+#elif defined( __VMS ) || defined(__sgi)
#include <inttypes.h>
#elif defined(__SCO__) || defined(__USLC__)
#include <stdint.h>
diff --git a/include/GL/glxext.h b/include/GL/glxext.h
index 0f66df6277a..aedc311cbf4 100644
--- a/include/GL/glxext.h
+++ b/include/GL/glxext.h
@@ -380,7 +380,7 @@ typedef struct {
#endif
#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
+/* This code block is duplicated in glext.h, so must be protected */
#define GLEXT_64_TYPES_DEFINED
/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
/* (as used in the GLX_OML_sync_control extension). */
@@ -389,7 +389,7 @@ typedef struct {
#elif defined(__sun__) || defined(__digital__)
#include <inttypes.h>
#if defined(__STDC__)
-#if defined(__arch64__)
+#if defined(__arch64__) || defined(_LP64)
typedef long int int64_t;
typedef unsigned long int uint64_t;
#else
@@ -397,7 +397,7 @@ typedef long long int int64_t;
typedef unsigned long long int uint64_t;
#endif /* __arch64__ */
#endif /* __STDC__ */
-#elif defined( __VMS )
+#elif defined( __VMS ) || defined(__sgi)
#include <inttypes.h>
#elif defined(__SCO__) || defined(__USLC__)
#include <stdint.h>
diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h
index dbbf2b91949..6e725b18a9d 100644
--- a/include/GLES/glplatform.h
+++ b/include/GLES/glplatform.h
@@ -51,7 +51,11 @@ extern "C" {
# else
# define GL_API __declspec(dllimport)
# endif
-# define GL_APIENTRY __stdcall
+# ifdef UNDER_CE
+# define GL_APIENTRY
+# else
+# define GL_APIENTRY __stdcall
+# endif
#else
# ifdef __GL_EXPORTS
# define GL_API
diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h
index 348daea7656..7891a61ed7a 100644
--- a/include/GLES2/gl2platform.h
+++ b/include/GLES2/gl2platform.h
@@ -51,7 +51,11 @@ extern "C" {
# else
# define GL_APICALL __declspec(dllimport)
# endif
-# define GL_APIENTRY __stdcall
+# ifdef UNDER_CE
+# define GL_APIENTRY
+# else
+# define GL_APIENTRY __stdcall
+# endif
#else
# ifdef __GL_EXPORTS
# define GL_APICALL