wok-current diff opencpn/stuff/glib.u @ rev 20383
p11-kit update: 0.6 (2011) -> 0.23.12 (2018)
author | Erkan Yilmaz <erkan@slitaz.org> |
---|---|
date | Wed Jun 20 09:49:15 2018 +0000 (2018-06-20) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/opencpn/stuff/glib.u Wed Jun 20 09:49:15 2018 +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 +