|
2760
|
1 |
--- wxWidgets-2.8.10-orig/src/gtk/gsockgtk.cpp 2009-03-06 12:11:40.000000000 +0000
|
|
|
2 |
+++ wxWidgets-2.8.10/src/gtk/gsockgtk.cpp 2010-06-04 08:23:48.380627757 +0000
|
|
|
3 |
@@ -15,8 +15,13 @@
|
|
|
4 |
#include <stdlib.h>
|
|
|
5 |
#include <stdio.h>
|
|
|
6 |
|
|
|
7 |
+// newer versions of glib define its own GSocket but we unfortunately use this
|
|
|
8 |
+// name in our own (semi-)public header and so can't change it -- rename glib
|
|
|
9 |
+// one instead
|
|
|
10 |
+#define GSocket GlibGSocket
|
|
|
11 |
#include <gdk/gdk.h>
|
|
|
12 |
#include <glib.h>
|
|
|
13 |
+#undef GSocket
|
|
|
14 |
|
|
|
15 |
#include "wx/gsocket.h"
|
|
|
16 |
#include "wx/unix/gsockunx.h"
|