Re-enable GSocket rename workaround for gtk

ktec · Jan 25, 2010 · d48a34b · d48a34b
1 parent 2f1cf93
commit d48a34b
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/include/nmea.h b/include/nmea.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: nmea.h,v 1.24 2010/01/02 01:58:12 bdbcat Exp $
+ * $Id: nmea.h,v 1.25 2010/01/25 01:31:53 badfeed Exp $
  *
  * Project:  OpenCP
  * Purpose:  NMEA Data Object
@@ -26,6 +26,9 @@
  ***************************************************************************
  *
  * $Log: nmea.h,v $
+ * Revision 1.25  2010/01/25 01:31:53  badfeed
+ * Re-enable GSocket rename workaround for gtk
+ *
  * Revision 1.24  2010/01/02 01:58:12  bdbcat
  * Clone Event
  *
@@ -106,10 +109,10 @@
 // newer versions of glib define its own GSocket but we unfortunately use this
 // name in our own (semi-)public header and so can't change it -- rename glib
 // one instead
-//#define GSocket GlibGSocket
-//#include <gdk/gdk.h>
+#define GSocket GlibGSocket
+#include <gtk/gtk.h>
 //#include <glib.h>
-//#undef GSocket
+#undef GSocket
 #endif