From 1516573df46239ea76b7a8b142a6b719668cb26d Mon Sep 17 00:00:00 2001
From: okaestne <git@oliver-kaestner.de>
Date: Sun, 15 Nov 2020 15:05:51 +0100
Subject: Include cleanup: components

---
 src/components/ble/MusicService.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/components/ble/MusicService.h')

diff --git a/src/components/ble/MusicService.h b/src/components/ble/MusicService.h
index b365909b..ee3628b0 100644
--- a/src/components/ble/MusicService.h
+++ b/src/components/ble/MusicService.h
@@ -18,10 +18,13 @@
 #pragma once
 
 #include <cstdint>
-#include <array>
+#include <string>
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
 #include <host/ble_uuid.h>
-#include <string>
+#undef max
+#undef min
 
 //c7e50000-78fc-48fe-8e23-43b37a1942d0
 #define MUSIC_SERVICE_UUID_BASE {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0xe5, 0xc7}
-- 
cgit v1.2.3-70-g09d2