build: Work around duplicated define of APIENTRY

Benjamin Otte · Benjamin Otte · commit 591bc5edc02b · 2024-10-21T07:35:41.000+02:00
epoxy defines it if windows.h hasn't been included. So include windows.h before epoxy. See also anholt/libepoxy#299
diff --git a/gdk/gdkmemoryformatprivate.h b/gdk/gdkmemoryformatprivate.h
@@ -22,6 +22,11 @@
 #include "gdkenums.h"
 #include "gdktypes.h"
 
+/* epoxy needs this, see https://github.com/anholt/libepoxy/issues/299 */
+#ifdef GDK_WINDOWING_WIN32
+#include <windows.h>
+#endif
+
 #include <epoxy/gl.h>
 
 #ifdef GDK_RENDERING_VULKAN
diff --git a/gdk/win32/gdkglcontext-win32.h b/gdk/win32/gdkglcontext-win32.h
@@ -21,6 +21,10 @@
 #pragma once
 
 #ifndef DONT_INCLUDE_LIBEPOXY
+#ifdef GDK_WINDOWING_WIN32
+/* epoxy needs this, see https://github.com/anholt/libepoxy/issues/299 */
+#include <windows.h>
+#endif
 #include <epoxy/gl.h>
 #include <epoxy/wgl.h>
 
diff --git a/gsk/gl/gskgltypesprivate.h b/gsk/gl/gskgltypesprivate.h
@@ -20,10 +20,14 @@
 
 #pragma once
 
-#include <epoxy/gl.h>
-#include <graphene.h>
 #include <gdk/gdk.h>
 #include <gsk/gsk.h>
+#ifdef GDK_WINDOWING_WIN32
+/* epoxy needs this, see https://github.com/anholt/libepoxy/issues/299 */
+#include <windows.h>
+#endif
+#include <epoxy/gl.h>
+#include <graphene.h>
 
 G_BEGIN_DECLS
 
diff --git a/testsuite/gdk/gltexture.c b/testsuite/gdk/gltexture.c
@@ -1,4 +1,8 @@
 #include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_WIN32
+/* epoxy needs this, see https://github.com/anholt/libepoxy/issues/299 */
+#include <windows.h>
+#endif
 #include <epoxy/gl.h>
 #include "gdk/gdktextureprivate.h"
 #include "gdk/gdkglcontextprivate.h"
