summaryrefslogtreecommitdiffstats
path: root/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp')
-rw-r--r--x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp b/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp
new file mode 100644
index 000000000..9ad23614f
--- /dev/null
+++ b/x11-toolkits/wxgtk24/files/patch-src-gtk-gsockgtk.cpp
@@ -0,0 +1,18 @@
+--- src/gtk/gsockgtk.c.orig 2003-09-21 13:31:58.000000000 +0200
++++ src/gtk/gsockgtk.c 2009-09-28 13:38:26.000000000 +0200
+@@ -13,8 +13,15 @@
+ #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
++#define _GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
++#undef _GSocket
+
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"