mirror of
https://github.com/Ponce/slackbuilds
synced 2024-12-04 00:56:07 +01:00
17 lines
537 B
Diff
17 lines
537 B
Diff
|
--- wxGTK-2.8.10/src/gtk/gsockgtk.cpp 2009-03-06 09:18:08.000000000 -0300
|
||
|
|
+++ wxGTK-2.8.10_patched/src/gtk/gsockgtk.cpp 2010-03-27 08:32:57.000000000 -0300
|
||
|
|
@@ -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"
|