From 28525d7b6907a7a7a33beb4197354c776cec0272 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Thu, 15 Aug 2013 20:35:33 +1000 Subject: [PATCH] Forward declare NSM_Client class in ardour_ui.h nsm.h pulls in winsock2.h and with the mingw build and it causes endless warnings from the compiler --- gtk2_ardour/ardour_ui.cc | 1 + gtk2_ardour/ardour_ui.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 4902968db8..e3c446ecc2 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -101,6 +101,7 @@ typedef uint64_t microseconds_t; #include "missing_plugin_dialog.h" #include "mixer_ui.h" #include "mouse_cursors.h" +#include "nsm.h" #include "opts.h" #include "pingback.h" #include "processor_box.h" diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index ff324fd6f9..20edfe03eb 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -72,7 +72,6 @@ #include "ardour_window.h" #include "editing.h" #include "meterbridge.h" -#include "nsm.h" #include "ui_config.h" #include "enums.h" #include "visibility_group.h" @@ -105,6 +104,7 @@ class SpeakerDialog; class ThemeManager; class TimeInfoBox; class MidiTracer; +class NSM_Client; class LevelMeterHBox; class GlobalPortMatrixWindow; class GUIObjectState;