[patch] codeblocks-8.02-gsocket.patch

codeblocks-8.02-gsocket.patch (text/plain), 1.33 KB, created by Ryan Hill (RETIRED) on 2010-04-17 07:16:09 UTC

diff --git a/src/plugins/contrib/codesnippets/codesnippets.cpp b/src/plugins/contrib/codesnippets/codesnippets.cpp
index 499c815..7fc1017 100644
--- a/src/plugins/contrib/codesnippets/codesnippets.cpp
+++ b/src/plugins/contrib/codesnippets/codesnippets.cpp
@@ -52,8 +52,12 @@
 #include "memorymappedfile.h"
 
 #if defined(__WXGTK__)
+	 // hack to avoid name-conflict between wxWidgets GSocket and the one defined
+	// in newer glib-headers
+	#define GSocket GLibSocket
+	#include <gdk/gdkx.h>
+	#undef GSocket
     #include "wx/gtk/win_gtk.h"
-    #include <gdk/gdkx.h>
 #endif
 
 // The plugin needs a flag ON to enable some code for the plugin
diff --git a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
index d33b08d..220070d 100644
--- a/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
+++ b/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
@@ -49,8 +49,12 @@
 #include "menuidentifiers.h"
 #include "editsnippetframe.h"
 #if defined(__WXGTK__)
+	 // hack to avoid name-conflict between wxWidgets GSocket and the one defined
+	// in newer glib-headers
+	#define GSocket GLibSocket
+	#include <gdk/gdkx.h>
+	#undef GSocket
     #include "wx/gtk/win_gtk.h"
-    #include <gdk/gdkx.h>
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)