From 30efdbe0f8ea8477ea41c24f58774bdcc32dfd8b Mon Sep 17 00:00:00 2001
From: John Emmas <john@creativepost.co.uk>
Date: Sun, 21 Aug 2022 12:34:10 +0100
Subject: [PATCH] Some minor reverts to commit #63f94d29463 (from 25th May
 2022)

These were preventing Ardour from compiling on Windows (Clang or MSVC)

Possibly would've been buildable with MinGW but I don't have that available to test.
---
 gtk2_ardour/ardour_ui.cc     | 1 +
 gtk2_ardour/midi_time_axis.h | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 2e0ab4aa79..ec18d179e6 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -68,6 +68,7 @@
 #include "pbd/openuri.h"
 #include "pbd/types_convert.h"
 #include "pbd/file_utils.h"
+#include <pbd/localtime_r.h>
 #include "pbd/pthread_utils.h"
 #include "pbd/replace_all.h"
 #include "pbd/scoped_file_descriptor.h"
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index b0ae8a529d..e993d39a45 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -45,11 +45,13 @@
 #include "route_time_axis.h"
 #include "midi_streamview.h"
 
-namespace MIDI::Name {
+namespace MIDI {
+namespace Name {
 class MasterDeviceNames;
 class CustomDeviceMode;
 struct PatchPrimaryKey;
 }
+}
 
 namespace ARDOUR {
 	class Session;