Skip to content

Commit d13de28

Browse files
earlephilhowerme-no-dev
authored andcommitted
Undo the redefinition of FPSTR from 8266 merge (espressif#2726)
Fixes Arduino.h redefinition errors.
1 parent 697d4ff commit d13de28

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Diff for: cores/esp32/WString.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ class StringSumHelper;
3535
// an abstract class used as a means to proide a unique pointer type
3636
// but really has no body
3737
class __FlashStringHelper;
38-
#define FPSTR(pstr_pointer) (reinterpret_cast<const __FlashStringHelper *>(pstr_pointer))
39-
#define F(string_literal) (FPSTR(PSTR(string_literal)))
38+
#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
4039

4140
// The string class
4241
class String {

0 commit comments

Comments
 (0)