diff options
| author | JF002 <JF002@users.noreply.github.com> | 2020-12-01 20:44:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 20:44:44 (GMT) |
| commit | c6556bcdea7671f1c1daaa9e20c4c3d7cd5f29a4 (patch) | |
| tree | 38c920cd13ed3768af2363de317ef3adf4483bd6 /src/components/ble/MusicService.h | |
| parent | c87de415b28710ec0f5a504fe4720402b9be5ebc (diff) | |
| parent | 6e22509b5ffe6d7c29d09b07f38e64fb1bdc0b21 (diff) | |
Merge pull request #136 from okaestne/include-cleanup
Includes cleanup
Diffstat (limited to 'src/components/ble/MusicService.h')
| -rw-r--r-- | src/components/ble/MusicService.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/components/ble/MusicService.h b/src/components/ble/MusicService.h index b365909..ee3628b 100644 --- a/src/components/ble/MusicService.h +++ b/src/components/ble/MusicService.h @@ -18,10 +18,13 @@ #pragma once #include <cstdint> -#include <array> +#include <string> +#define min // workaround: nimble's min/max macros conflict with libstdc++ +#define max #include <host/ble_gap.h> #include <host/ble_uuid.h> -#include <string> +#undef max +#undef min //c7e50000-78fc-48fe-8e23-43b37a1942d0 #define MUSIC_SERVICE_UUID_BASE {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0xe5, 0xc7} |