$OpenBSD: patch-src_AudacityApp_cpp,v 1.3 2009/10/28 18:40:13 jakemsr Exp $
--- src/AudacityApp.cpp.orig	Sat Oct 17 15:34:48 2009
+++ src/AudacityApp.cpp	Sat Oct 17 15:37:06 2009
@@ -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,8 @@ void QuitAudacity()
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <dlfcn.h>
-#include <gtk/gtk.h>
+#include <glib/gtypes.h>
+#include <glib-object.h>
 
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;