diff options
author | JF002 <JF002@users.noreply.github.com> | 2020-12-01 21:44:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-01 21:44:44 +0100 |
commit | c6556bcdea7671f1c1daaa9e20c4c3d7cd5f29a4 (patch) | |
tree | 38c920cd13ed3768af2363de317ef3adf4483bd6 /src/components/ble/CurrentTimeClient.h | |
parent | c87de415b28710ec0f5a504fe4720402b9be5ebc (diff) | |
parent | 6e22509b5ffe6d7c29d09b07f38e64fb1bdc0b21 (diff) |
Merge pull request #136 from okaestne/include-cleanup
Includes cleanup
Diffstat (limited to 'src/components/ble/CurrentTimeClient.h')
-rw-r--r-- | src/components/ble/CurrentTimeClient.h | 10 |
1 files changed, 6 insertions, 4 deletions
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 <host/ble_gap.h> +#undef max +#undef min #include <cstdint> -#include <array> - -#include "components/datetime/DateTimeController.h" #include "BleClient.h" -#include <host/ble_gap.h> namespace Pinetime { namespace Controllers { + class DateTime; class CurrentTimeClient : public BleClient { public: |