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/DeviceInformationService.h | |
| parent | c87de415b28710ec0f5a504fe4720402b9be5ebc (diff) | |
| parent | 6e22509b5ffe6d7c29d09b07f38e64fb1bdc0b21 (diff) | |
Merge pull request #136 from okaestne/include-cleanup
Includes cleanup
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 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 { |