From f20f618327deba5091a384eb749fd4b4f7c10a2f Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Thu, 21 Jun 2018 05:01:50 +0300
Subject: Fixed build of MIDI sequencer out of pre-included private ADLMIDI's
 header

---
 src/adlmidi_private.hpp     | 2 +-
 src/adlmidi_sequencer.cpp   | 5 +++--
 src/midi_sequencer_impl.hpp | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp
index 446bae0..06d21ab 100644
--- a/src/adlmidi_private.hpp
+++ b/src/adlmidi_private.hpp
@@ -134,7 +134,7 @@ typedef int32_t ssize_t;
 #include "file_reader.hpp"
 
 #ifndef ADLMIDI_DISABLE_MIDI_SEQUENCER
-// Rename class to avoid ABI conflicts
+// Rename class to avoid ABI collisions
 #define BW_MidiSequencer AdlMidiSequencer
 #include "midi_sequencer.hpp"
 typedef BW_MidiSequencer MidiSequencer;
diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp
index 8bc3569..fcc1380 100644
--- a/src/adlmidi_sequencer.cpp
+++ b/src/adlmidi_sequencer.cpp
@@ -23,11 +23,12 @@
 
 #ifndef ADLMIDI_DISABLE_MIDI_SEQUENCER
 
-#include "adlmidi_private.hpp"
-
+// Rename class to avoid ABI collisions
+#define BW_MidiSequencer AdlMidiSequencer
 // Inlucde MIDI sequencer class implementation
 #include "midi_sequencer_impl.hpp"
 
+#include "adlmidi_private.hpp"
 
 /****************************************************
  *           Real-Time MIDI calls proxies           *
diff --git a/src/midi_sequencer_impl.hpp b/src/midi_sequencer_impl.hpp
index 1d627fe..8c0e3dd 100644
--- a/src/midi_sequencer_impl.hpp
+++ b/src/midi_sequencer_impl.hpp
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <memory>
 #include <cstring>
+#include <set>
 
 #include <assert.h>
 
-- 
cgit v1.2.3