summaryrefslogtreecommitdiff
path: root/x11/wxGTK26/patches/patch-ad
blob: fd0faf74566ac7dd7aaa4295f738a33a932dbf7c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
$NetBSD: patch-ad,v 1.1 2009/10/23 11:16:55 plunky Exp $

avoid conflicts with GSocket in glib >= 2.21 as per

	http://trac.wxwidgets.org/ticket/10883

--- src/gtk/gsockgtk.cpp.orig	2009-10-23 11:43:01.000000000 +0100
+++ src/gtk/gsockgtk.cpp	2009-10-23 11:43:04.000000000 +0100
@@ -14,8 +14,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"