wok diff wxWidgets/stuff/gsockgtk.patch @ rev 5586
Up:xcb-proto
author | Rohit Joshi <jozee@slitaz.org> |
---|---|
date | Mon May 17 07:32:06 2010 -0400 (2010-05-17) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/wxWidgets/stuff/gsockgtk.patch Mon May 17 07:32:06 2010 -0400 1.3 @@ -0,0 +1,16 @@ 1.4 +--- src/gtk/gsockgtk.cpp Fri Mar 6 13:11:40 2009 1.5 ++++ src/gtk/gsockgtk.cpp Thu Sep 17 12:10:10 2009 1.6 +@@ -15,8 +15,13 @@ 1.7 + #include <stdlib.h> 1.8 + #include <stdio.h> 1.9 + 1.10 ++// newer versions of glib define its own GSocket but we unfortunately use this 1.11 ++// name in our own (semi-)public header and so can't change it -- rename glib 1.12 ++// one instead 1.13 ++#define GSocket GlibGSocket 1.14 + #include <gdk/gdk.h> 1.15 + #include <glib.h> 1.16 ++#undef GSocket 1.17 + 1.18 + #include "wx/gsocket.h" 1.19 + #include "wx/unix/gsockunx.h"