head	1.2;
access;
symbols
	pkgsrc-2015Q3:1.1.0.48
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.46
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.44
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.42
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.40
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.38
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.36
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.34
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.32
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.30
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.28
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.26
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.24
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.22
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.20
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.18
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.16
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.14
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.12
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.10
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.8
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.6
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.4
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.2
	pkgsrc-2009Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.10.24.19.24.10;	author joerg;	state dead;
branches;
next	1.1;
commitid	oRJnQ9Y05Xi5CoGy;

1.1
date	2009.10.23.11.16.55;	author plunky;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Retire wxGTK26.
@
text
@$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"
@


1.1
log
@
avoid conflicts with GSocket in glib >= 2.21 as per

	http://trac.wxwidgets.org/ticket/10883
@
text
@d1 1
a1 1
$NetBSD: patch-ad$
@