diff --git a/src/gtk/gsockgtk.cpp b/src/gtk/gsockgtk.cpp index 390b19982e..eb7e78e6c2 100644 --- a/src/gtk/gsockgtk.cpp +++ b/src/gtk/gsockgtk.cpp @@ -15,8 +15,13 @@ #include #include +// 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 #include +#undef GSocket #include "wx/gsocket.h" #include "wx/unix/gsockunx.h"