wok-current view wxWidgets/stuff/gsockgtk.patch @ rev 9406
Up: vlc to 1.1.8.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Mon Mar 28 19:40:04 2011 +0000 (2011-03-28) |
| parents | |
| children |
line source
1 --- src/gtk/gsockgtk.cpp Fri Mar 6 13:11:40 2009
2 +++ src/gtk/gsockgtk.cpp Thu Sep 17 12:10:10 2009
3 @@ -15,8 +15,13 @@
4 #include <stdlib.h>
5 #include <stdio.h>
7 +// newer versions of glib define its own GSocket but we unfortunately use this
8 +// name in our own (semi-)public header and so can't change it -- rename glib
9 +// one instead
10 +#define GSocket GlibGSocket
11 #include <gdk/gdk.h>
12 #include <glib.h>
13 +#undef GSocket
15 #include "wx/gsocket.h"
16 #include "wx/unix/gsockunx.h"