Merge branch 'main' into main

This commit is contained in:
liamcharger 2024-03-14 10:49:48 -04:00 committed by GitHub
commit 3eea3dd7a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2,9 +2,9 @@
#define min // workaround: nimble's min/max macros conflict with libstdc++
#define max
#include <host/ble_gap.h>
#include <atomic>
#undef max
#undef min
#include <atomic>
namespace Pinetime {
namespace Controllers {