From 2f907f47bb27ea11030e758fb70c26d0e30373b0 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Mon, 3 Dec 2018 11:14:10 -0800 Subject: [PATCH] Fix pgmspace 32-bit read macros (#5425) Looks like the pgm_read_(32bit) defines were not used in the main core, and they contained syntax errors when invoked due to some bad bracket/parens. Fix the macros --- tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h b/tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h index bb517366b..ba46d8468 100644 --- a/tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h +++ b/tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h @@ -71,13 +71,13 @@ static inline uint16_t pgm_read_word_inlined(const void* addr) { #define pgm_read_byte(addr) pgm_read_byte_inlined(addr) #define pgm_read_word(addr) pgm_read_word_inlined(addr) #ifdef __cplusplus - #define pgm_read_dword(addr) (*reinterpret_cast - #define pgm_read_float(addr) (*reinterpret_cast - #define pgm_read_ptr(addr) (*reinterpret_cast + #define pgm_read_dword(addr) (*reinterpret_cast(addr)) + #define pgm_read_float(addr) (*reinterpret_cast(addr)) + #define pgm_read_ptr(addr) (*reinterpret_cast(addr)) #else #define pgm_read_dword(addr) (*(const uint32_t*)(addr)) #define pgm_read_float(addr) (*(const float)(addr)) - #define pgm_read_ptr(addr) (*(const void const *)(addr)) + #define pgm_read_ptr(addr) (*(const void*)(addr)) #endif #define pgm_read_byte_near(addr) pgm_read_byte(addr)