[packages/wxWidgets.git] / gsocket.patch

fix build with glib >= 2.21 (stolen from Fedora)
--- 2.8/src/gtk/gsockgtk.cpp (revision 60599)
+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
@@ -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"
Commit	Line	Data
3ba46d19 SS	1	fix build with glib >= 2.21 (stolen from Fedora)
	2	--- 2.8/src/gtk/gsockgtk.cpp (revision 60599)
	3	+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
	4	@@ -15,8 +15,13 @@
	5	#include <stdlib.h>
	6	#include <stdio.h>
	7
	8	+// newer versions of glib define its own GSocket but we unfortunately use this
	9	+// name in our own (semi-)public header and so can't change it -- rename glib
	10	+// one instead
	11	+#define GSocket GlibGSocket
	12	#include <gdk/gdk.h>
	13	#include <glib.h>
	14	+#undef GSocket
	15
	16	#include "wx/gsocket.h"
	17	#include "wx/unix/gsockunx.h"