| 1234567891011121314151617181920212223242526272829 |
- $OpenBSD: patch-src_AudacityApp_cpp,v 1.4 2012/03/23 13:28:25 ajacoutot Exp $
- error: #error "Only <glib.h> can be included directly."
- --- src/AudacityApp.cpp.orig Mon Aug 31 12:45:38 2009
- +++ src/AudacityApp.cpp Fri Mar 23 13:34:45 2012
- @@ -21,6 +21,12 @@ It handles initialization and termination by subclassi
- #include <vld.h>
- #endif
-
- +// Newer versions of glib have a conflicting GSocket macro; the wxWindows
- +// one is part of a semi-public interface so needs to be kept.
- +#define GSocket GlibSocket
- +#include <gtk/gtk.h>
- +#undef GSocket
- +
- #include "Audacity.h" // This should always be included first
-
- #include <wx/defs.h>
- @@ -329,7 +335,7 @@ void QuitAudacity()
- ///////////////////////////////////////////////////////////////////////////////
-
- #include <dlfcn.h>
- -#include <gtk/gtk.h>
- +#include <glib.h>
-
- typedef struct _GnomeProgram GnomeProgram;
- typedef struct _GnomeModuleInfo GnomeModuleInfo;
|
