X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fgl.h;h=f27b63fe8cf68c1ff302511907be0984fa9eb9e8;hp=f7cba6b7aeaa098ff9ff6811c63cff6fa583ef4a;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=bdced13c0814d1a860573a0ac19964da2ac4d5e1

diff --git a/source/gl.h b/source/gl.h
index f7cba6b7..f27b63fe 100644
--- a/source/gl.h
+++ b/source/gl.h
@@ -2,17 +2,36 @@
 #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>
+#include <GLES3/gl3.h>
+#include <GLES3/gl3ext.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>