Contents of /trunk/wxgtk/patches/wxgtk-2.8.10-glib-2.22-gsocket.patch
Parent Directory | Revision Log
Revision 924 -
(show annotations)
(download)
Wed Nov 4 12:05:45 2009 UTC (14 years, 10 months ago) by niro
File size: 569 byte(s)
Wed Nov 4 12:05:45 2009 UTC (14 years, 10 months ago) by niro
File size: 569 byte(s)
patches
1 | Index: 2.8/src/gtk/gsockgtk.cpp |
2 | =================================================================== |
3 | --- 2.8/src/gtk/gsockgtk.cpp (revision 60599) |
4 | +++ 2.8/src/gtk/gsockgtk.cpp (working copy) |
5 | @@ -15,8 +15,13 @@ |
6 | #include <stdlib.h> |
7 | #include <stdio.h> |
8 | |
9 | +// newer versions of glib define its own GSocket but we unfortunately use this |
10 | +// name in our own (semi-)public header and so can't change it -- rename glib |
11 | +// one instead |
12 | +#define GSocket GlibGSocket |
13 | #include <gdk/gdk.h> |
14 | #include <glib.h> |
15 | +#undef GSocket |
16 | |
17 | #include "wx/gsocket.h" |
18 | #include "wx/unix/gsockunx.h" |