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