Skip to content

Commit 4d86a3c

Browse files
PwnVerseJF002
authored andcommitted
Fix conflicts of min and max from stl_algo.h (included from atomic)
1 parent 3b4b5a5 commit 4d86a3c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/components/ble/HeartRateService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#define min // workaround: nimble's min/max macros conflict with libstdc++
33
#define max
44
#include <host/ble_gap.h>
5-
#include <atomic>
65
#undef max
76
#undef min
7+
#include <atomic>
88

99
namespace Pinetime {
1010
namespace Controllers {

0 commit comments

Comments
 (0)