File wxGTK-GSocket-clash.patch of Package wxGTK
Index: /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/gsockgtk.cpp =================================================================== --- /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/gsockgtk.cpp (revision 37159) +++ /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/gsockgtk.cpp (revision 61009) @@ -16,6 +16,11 @@ #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"