summaryrefslogtreecommitdiff
path: root/include/GL
diff options
context:
space:
mode:
Diffstat (limited to 'include/GL')
-rw-r--r--include/GL/gl.h11
-rw-r--r--include/GL/glut.h2
-rw-r--r--include/GL/internal/glcore.h2
3 files changed, 11 insertions, 4 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index 3891a71875..c9ef6136fa 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -58,7 +58,11 @@
# else /* for use with static link lib build of Win32 edition only */
# define GLAPI extern
# endif /* _STATIC_MESA support */
-# define GLAPIENTRY __stdcall
+# 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
+# endif
#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
# define GLAPI extern
# define GLAPIENTRY __stdcall
@@ -84,8 +88,9 @@
#include <windows.h>
#endif
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \
- && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WIN32_WCE) \
+ && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) \
+ && !defined(__CYGWIN__) || defined(__MINGW32__)
#include <GL/mesa_wgl.h>
#endif
diff --git a/include/GL/glut.h b/include/GL/glut.h
index 137b8efa13..49225361bb 100644
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -53,7 +53,7 @@ extern "C" {
/* To disable supression of annoying warnings about floats being promoted
to doubles, define GLUT_NO_WARNING_DISABLE in your compile preprocessor
options. */
-# ifndef GLUT_NO_WARNING_DISABLE
+# if defined(_MSC_VER) && !defined(GLUT_NO_WARNING_DISABLE)
# pragma warning (disable:4244) /* Disable bogus VC++ 4.2 conversion warnings. */
# pragma warning (disable:4305) /* VC++ 5.0 version of above warning. */
# endif
diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h
index 99de6c097f..547b111370 100644
--- a/include/GL/internal/glcore.h
+++ b/include/GL/internal/glcore.h
@@ -31,7 +31,9 @@
* Silicon Graphics, Inc.
*/
+#if !defined(_WIN32_WCE)
#include <sys/types.h>
+#endif
#define GL_CORE_SGI 1
#define GL_CORE_MESA 2