summaryrefslogtreecommitdiffstats
path: root/extra/wxgtk/glib-2.21.patch
blob: 079fe28d6b695777b7b18c7d1ebc5c53e565473e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
--- 2.8/src/gtk/gsockgtk.cpp (revision 60599)
+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
@@ -15,8 +15,13 @@
 #include <stdlib.h>
 #include <stdio.h>

+// newer versions of glib define its own GSocket but we unfortunately use this
+// name in our own (semi-)public header and so can't change it -- rename glib
+// one instead
+#define GSocket GlibGSocket
 #include <gdk/gdk.h>
 #include <glib.h>
+#undef GSocket

 #include "wx/gsocket.h"
 #include "wx/unix/gsockunx.h"