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/DeviceInformationService.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/src/components/ble/DeviceInformationService.h b/src/components/ble/DeviceInformationService.h
index 25ab8402..94ca7bbf 100644
--- a/src/components/ble/DeviceInformationService.h
+++ b/src/components/ble/DeviceInformationService.h
@@ -1,9 +1,10 @@
 #pragma once
-#include <cstdint>
-#include <array>
-
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
-#include <Version.h>
+#undef max
+#undef min
+#include "Version.h"
 
 namespace Pinetime {
   namespace Controllers {
-- 
cgit v1.2.3-70-g09d2