diff options
| author | okaestne <git@oliver-kaestner.de> | 2020-11-15 14:05:51 (GMT) |
|---|---|---|
| committer | okaestne <git@oliver-kaestner.de> | 2020-11-16 00:35:45 (GMT) |
| commit | 1516573df46239ea76b7a8b142a6b719668cb26d (patch) | |
| tree | b11259f8ca0e10e3d1e2da5df827703ac0294317 /src/components/ble/DeviceInformationService.h | |
| parent | c3475b92fad2eff4b2a43e5343863d11fe4caca3 (diff) | |
Include cleanup: components
Diffstat (limited to 'src/components/ble/DeviceInformationService.h')
| -rw-r--r-- | src/components/ble/DeviceInformationService.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/components/ble/DeviceInformationService.h b/src/components/ble/DeviceInformationService.h index 25ab840..94ca7bb 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 { |