From d1208a9c0a4e10fca4070ec0b1c63fd02ecdb104 Mon Sep 17 00:00:00 2001
From: Valeriy Kamyshniy <vkamyshniy@wavesglobal.com>
Date: Wed, 3 Dec 2014 01:24:08 +0200
Subject: [PATCH] [Summary] Fixing the following compilation error:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In file included from ../gtk2_ardour/marker_selection.h:25,
                 from ../gtk2_ardour/selection.h:38,
                 from ../gtk2_ardour/ardour_ui.h:100,
                 from ../gtk2_ardour/cocoacarbon.mm:29:
../gtk2_ardour/marker.h:50: error: redefinition of ‘class Marker’
---
 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 ccb97bcf11..970e6cf1a0 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -144,6 +144,7 @@ typedef uint64_t microseconds_t;
 #include "open_file_dialog_proxy.h"
 #include "waves_message_dialog.h"
 #include "crash_recovery_dialog.h"
+#include "selection.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index c0a2f2f2ca..d6d6cb3d05 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -97,8 +97,8 @@
 
 #include "timecode/time.h"
 #include "time.h"
-#include "selection.h"
 
+struct MarkerSelection;
 class VideoTimeLine;
 class ArdourKeyboard;
 class AudioClock;