wok diff opencpn/stuff/glib.u @ rev 17595

Up: glib 2.43.3
author Alexander Medvedev <devl547@gmail.com>
date Tue Feb 10 20:09:44 2015 +0000 (2015-02-10)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/opencpn/stuff/glib.u	Tue Feb 10 20:09:44 2015 +0000
     1.3 @@ -0,0 +1,14 @@
     1.4 +Both glib and wx define GSocket, see http://trac.wxwidgets.org/ticket/10883
     1.5 +
     1.6 +--- include/dychart.h
     1.7 ++++ include/dychart.h
     1.8 +@@ -211,7 +211,9 @@
     1.9 + 
    1.10 + #ifdef __WXGTK__
    1.11 + #ifdef ocpnUSE_GTK_OPTIMIZE
    1.12 ++#define GSocket GlibGSocket
    1.13 +     #include <gtk/gtk.h>
    1.14 ++#undef GSocket
    1.15 + #endif
    1.16 + #endif
    1.17 +