15 lines
380 B
Diff
15 lines
380 B
Diff
--- src/gtk/gsockgtk.cpp~
|
|
+++ src/gtk/gsockgtk.cpp
|
|
@@ -16,6 +16,11 @@
|
|
#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"
|