Fix incorrect definition of FPSTR() and move from pgmspace.h to WStri…

…ng.h (#1371) (#2961)
espressif · Jul 17, 2019 · 56ce580 · 56ce580
1 parent 509d31b
commit 56ce580
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cores/esp32/WString.h b/cores/esp32/WString.h
@@ -35,7 +35,8 @@ class StringSumHelper;
 // an abstract class used as a means to proide a unique pointer type
 // but really has no body
 class __FlashStringHelper;
-#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
+#define FPSTR(pstr_pointer) (reinterpret_cast<const __FlashStringHelper *>(pstr_pointer))
+#define F(string_literal) (FPSTR(PSTR(string_literal)))
 
 // The string class
 class String {

diff --git a/cores/esp32/pgmspace.h b/cores/esp32/pgmspace.h
@@ -32,7 +32,6 @@ typedef unsigned long prog_uint32_t;
 #define PROGMEM
 #define PGM_P         const char *
 #define PGM_VOID_P    const void *
-#define FPSTR(p)      ((const char *)(p))
 #define PSTR(s)       (s)
 #define _SFR_BYTE(n)  (n)