Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20473/src
Modified Files:
AudacityApp.cpp
Log Message:
Insert hack to work around glib-2.21 introducing a name which clashes with
wxGTK. Patch thanks to Brian Cameron
Index: AudacityApp.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- AudacityApp.cpp 18 Aug 2009 00:44:43 -0000 1.244
+++ AudacityApp.cpp 12 Sep 2009 20:25:43 -0000 1.245
@@ -329,7 +329,16 @@
///////////////////////////////////////////////////////////////////////////////
#include <dlfcn.h>
+/* There is a conflict between the type names used in Glib >= 2.21 and those in
+ * wxGTK. This is an exceptionally hackish solution to the name conflict, but
+ * is comparable to that used by wxGTK upstream:
+ * http://trac.wxwidgets.org/ticket/10883
+ * What we are doing is renaming Glib's GSocket to something else so we can
+ * use the name for our (well, wxGTK's) element
+ */
+#define GSocket GlibGSocket
#include <gtk/gtk.h>
+#undef GSocket
typedef struct _GnomeProgram GnomeProgram;
typedef struct _GnomeModuleInfo GnomeModuleInfo;
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
