From 1516573df46239ea76b7a8b142a6b719668cb26d Mon Sep 17 00:00:00 2001 From: okaestne Date: Sun, 15 Nov 2020 15:05:51 +0100 Subject: Include cleanup: components --- src/components/ble/CurrentTimeClient.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/components/ble/CurrentTimeClient.h') diff --git a/src/components/ble/CurrentTimeClient.h b/src/components/ble/CurrentTimeClient.h index 93139399..1b2e018c 100644 --- a/src/components/ble/CurrentTimeClient.h +++ b/src/components/ble/CurrentTimeClient.h @@ -1,13 +1,15 @@ #pragma once +#define min // workaround: nimble's min/max macros conflict with libstdc++ +#define max +#include +#undef max +#undef min #include -#include - -#include "components/datetime/DateTimeController.h" #include "BleClient.h" -#include namespace Pinetime { namespace Controllers { + class DateTime; class CurrentTimeClient : public BleClient { public: -- cgit v1.2.3