wok annotate opencpn/stuff/glib.u @ rev 17680
Rollback socat
| author | Yuri Pourre <yuripourre@gmail.com> |
|---|---|
| date | Thu Feb 19 12:49:41 2015 -0200 (2015-02-19) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@4319 | 1 Both glib and wx define GSocket, see http://trac.wxwidgets.org/ticket/10883 |
| pascal@4319 | 2 |
| pascal@4319 | 3 --- include/dychart.h |
| pascal@4319 | 4 +++ include/dychart.h |
| pascal@4319 | 5 @@ -211,7 +211,9 @@ |
| pascal@4319 | 6 |
| pascal@4319 | 7 #ifdef __WXGTK__ |
| pascal@4319 | 8 #ifdef ocpnUSE_GTK_OPTIMIZE |
| pascal@4319 | 9 +#define GSocket GlibGSocket |
| pascal@4319 | 10 #include <gtk/gtk.h> |
| pascal@4319 | 11 +#undef GSocket |
| pascal@4319 | 12 #endif |
| pascal@4319 | 13 #endif |
| pascal@4319 | 14 |