X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgl.h;h=69b9b130adb8f537d93a1ed32c5a7655974dcec3;hb=03e6c23f8141c5a1723c8acee00a46a15b0777be;hp=ae145457dff857d112a44c0b26d4ac7d9299df71;hpb=9dc2c20e8c7ac91d932b12492591b65786e24b0f;p=libs%2Fgl.git

diff --git a/source/gl.h b/source/gl.h
index ae145457..69b9b130 100644
--- a/source/gl.h
+++ b/source/gl.h
@@ -2,20 +2,43 @@
 #define MSP_GL_GL_H_
 
 #ifdef __APPLE__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-macro"
 #define extern extern __attribute__((weak_import))
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #undef extern
+#pragma clang diagnostic pop
 #elif defined(__ANDROID__)
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 typedef double GLdouble;
+typedef long long GLint64;
 #else
-#ifdef WIN32
-#include <windows.h>
+#ifdef _WIN32
+#ifndef WINAPI
+#if defined(_ARM_)
+#define WINAPI
+#else
+#define WINAPI __stdcall
+#endif
+#endif
+#ifndef APIENTRY
+#define APIENTRY WINAPI
+#endif
+#ifndef DECLSPEC_IMPORT
+#define DECLSPEC_IMPORT __declspec(dllimport)
+#endif
+#ifndef WINGDIAPI
+#define WINGDIAPI DECLSPEC_IMPORT
+#endif
 #endif
 #include <GL/gl.h>
 #include <GL/glext.h>
 #endif
 
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+
 #endif