blob: f1b796f0eda55695f5b9995696d6445e2ba804bc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
--- wxwidgets-2.8.10/src/gtk/gsockgtk-old.cpp 2009-03-06 13:11:40.000000000 +0100
+++ wxwidgets-2.8.10/src/gtk/gsockgtk.cpp 2009-10-11 20:47:24.000000000 +0200
@@ -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"
|
