Fix conflicting definition of ARDUINOJSON_DEFINE_STATIC_ARRAY()

This commit is contained in:
Benoit Blanchon committed 2021-12-31 14:39:38 +01:00
1 parent 67fc2d9897
commit 91ed68b4a6
2 files changed
+10 -14

No files matched your search

+1 -1
View File
@@ -35,7 +35,7 @@ inline uint32_t pgm_read_dword(const void* p) {
return *reinterpret_cast<const uint32_t*>(convertFlashToPtr(p));
}
#define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value) \
#define ARDUINOJSON_DEFINE_PROGMEM_ARRAY(type, name, value) \
static type const ARDUINOJSON_CONCAT2(name, _progmem)[] = value; \
static type const* name = reinterpret_cast<type const*>( \
convertPtrToFlash(ARDUINOJSON_CONCAT2(name, _progmem)));