wok-6.x annotate wxWidgets/stuff/gsockgtk.patch @ rev 14115

nmap: up 6.25
author Samuel Trassare <samuel_trassare@yahoo.com>
date Sun Feb 24 15:58:03 2013 -0800 (2013-02-24)
parents
children
rev   line source
pankso@4090 1 --- src/gtk/gsockgtk.cpp Fri Mar 6 13:11:40 2009
pankso@4090 2 +++ src/gtk/gsockgtk.cpp Thu Sep 17 12:10:10 2009
pankso@4090 3 @@ -15,8 +15,13 @@
pankso@4090 4 #include <stdlib.h>
pankso@4090 5 #include <stdio.h>
pankso@4090 6
pankso@4090 7 +// newer versions of glib define its own GSocket but we unfortunately use this
pankso@4090 8 +// name in our own (semi-)public header and so can't change it -- rename glib
pankso@4090 9 +// one instead
pankso@4090 10 +#define GSocket GlibGSocket
pankso@4090 11 #include <gdk/gdk.h>
pankso@4090 12 #include <glib.h>
pankso@4090 13 +#undef GSocket
pankso@4090 14
pankso@4090 15 #include "wx/gsocket.h"
pankso@4090 16 #include "wx/unix/gsockunx.h"