blob: 9ad23614f4863388cf7a2ac85d0818f9d9335122 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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"
|
