summaryrefslogtreecommitdiff
path: root/src/components/ble/BatteryInformationService.h
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2020-12-01 21:44:44 +0100
committerGitHub <noreply@github.com>2020-12-01 21:44:44 +0100
commitc6556bcdea7671f1c1daaa9e20c4c3d7cd5f29a4 (patch)
tree38c920cd13ed3768af2363de317ef3adf4483bd6 /src/components/ble/BatteryInformationService.h
parentc87de415b28710ec0f5a504fe4720402b9be5ebc (diff)
parent6e22509b5ffe6d7c29d09b07f38e64fb1bdc0b21 (diff)
Merge pull request #136 from okaestne/include-cleanup
Includes cleanup
Diffstat (limited to 'src/components/ble/BatteryInformationService.h')
-rw-r--r--src/components/ble/BatteryInformationService.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/components/ble/BatteryInformationService.h b/src/components/ble/BatteryInformationService.h
index 74b2222c..b00000a4 100644
--- a/src/components/ble/BatteryInformationService.h
+++ b/src/components/ble/BatteryInformationService.h
@@ -1,5 +1,9 @@
#pragma once
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
#include <host/ble_gap.h>
+#undef max
+#undef min
namespace Pinetime {
namespace System {