blob: 8026532a212a1677b35f7c470f4f0611a9a77e8a (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- src/AudacityApp.cpp.orig 2009-11-27 00:27:29.000000000 +0100
+++ src/AudacityApp.cpp 2009-11-27 00:48:36.000000000 +0100
@@ -23,6 +23,15 @@ It handles initialization and terminatio
#include "Audacity.h" // This should always be included first
+/*
+ * Get Gtk.h and Glib.h included and working around that glib got
+ * a GSocket class now
+ */
+#include <dlfcn.h>
+#define GSocket GlibGSocket
+#include <gtk/gtk.h>
+#undef GSocket
+
#include <wx/defs.h>
#include <wx/app.h>
#include <wx/docview.h>
@@ -328,8 +337,11 @@ void QuitAudacity()
// Most of this was taken from nsNativeAppSupportUnix.cpp from Mozilla.
///////////////////////////////////////////////////////////////////////////////
+/* moved up so it doesn't undefs GSocket from wxgtk */
+/*
#include <dlfcn.h>
#include <gtk/gtk.h>
+*/
typedef struct _GnomeProgram GnomeProgram;
typedef struct _GnomeModuleInfo GnomeModuleInfo;
|
