From be4bdb53656b3efa7ff6f40cd3eb93f960ee48b0 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 2 Mar 2020 17:44:10 +0100
Subject: [PATCH] Do not include <stdint.h> in the Ardour namespace

---
 libs/ardour/ardour/minimp3.h           | 4 +++-
 libs/ardour/ardour/mp3fileimportable.h | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/ardour/ardour/minimp3.h b/libs/ardour/ardour/minimp3.h
index ecbee3c3c5..23b44803d7 100644
--- a/libs/ardour/ardour/minimp3.h
+++ b/libs/ardour/ardour/minimp3.h
@@ -6,7 +6,9 @@
     This software is distributed without any warranty.
     See <http://creativecommons.org/publicdomain/zero/1.0/>.
 */
-#include <stdint.h>
+
+/* don't use global includes, since this file is included in "namespace ardour" */
+//#include <stdint.h>
 
 #define MINIMP3_MAX_SAMPLES_PER_FRAME (1152*2)
 
diff --git a/libs/ardour/ardour/mp3fileimportable.h b/libs/ardour/ardour/mp3fileimportable.h
index 1da65d0925..2a065eeba4 100644
--- a/libs/ardour/ardour/mp3fileimportable.h
+++ b/libs/ardour/ardour/mp3fileimportable.h
@@ -20,6 +20,8 @@
 #ifndef _ardour_mp3file_importable_source_h_
 #define _ardour_mp3file_importable_source_h_
 
+#include <stdint.h>
+
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/importable_source.h"