jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo the redefinition of FPSTR from 8266 merge (#2726)

Browse Source 
Fixes Arduino.h redefinition errors.
This commit is contained in:
Earle F. Philhower, III 2019-04-30 06:52:14 -07:00 committed by Me No Dev
parent 697d4ff7c4
commit d13de284b8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cores/esp32/WString.h
View File

@ -35,8 +35,7 @@ class StringSumHelper;
// an abstract class used as a means to proide a unique pointer type // an abstract class used as a means to proide a unique pointer type
// but really has no body // but really has no body
class __FlashStringHelper; class __FlashStringHelper;
#define FPSTR(pstr_pointer) (reinterpret_cast<const __FlashStringHelper *>(pstr_pointer)) #define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
#define F(string_literal) (FPSTR(PSTR(string_literal)))
// The string class // The string class
class String { class String {