Merge branch 'master' into showwindow

2026-09-22 16:52:57 +00:00 · 2012-08-28 17:52:31 +02:00
parent f5bfe41456 e10d935efe
commit d0ad28f174
36 changed files with 516 additions and 599 deletions
@@ -67,12 +67,6 @@ extern "C" {
 #endif
 #endif /* APIENTRY */

-/* TEMPORARY MinGW-w64 hacks.
- */
-#if __MINGW64__
- #define WINAPI
-#endif
-
 /* The following three defines are here solely to make some Windows-based
 * <GL/gl.h> files happy. Theoretically we could include <windows.h>, but
 * it has the major drawback of severely polluting our namespace.