summaryrefslogtreecommitdiffstats
path: root/extra/wxgtk/glib-2.21.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/wxgtk/glib-2.21.patch')
-rw-r--r--extra/wxgtk/glib-2.21.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/extra/wxgtk/glib-2.21.patch b/extra/wxgtk/glib-2.21.patch
new file mode 100644
index 000000000..079fe28d6
--- /dev/null
+++ b/extra/wxgtk/glib-2.21.patch
@@ -0,0 +1,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"