From d13de284b834efcaf6288ee23dde0c66c3c18c6f Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Tue, 30 Apr 2019 06:52:14 -0700 Subject: [PATCH] Undo the redefinition of FPSTR from 8266 merge (#2726) Fixes Arduino.h redefinition errors. --- cores/esp32/WString.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cores/esp32/WString.h b/cores/esp32/WString.h index 11b12aa0..e045538c 100644 --- a/cores/esp32/WString.h +++ b/cores/esp32/WString.h @@ -35,8 +35,7 @@ class StringSumHelper; // an abstract class used as a means to proide a unique pointer type // but really has no body class __FlashStringHelper; -#define FPSTR(pstr_pointer) (reinterpret_cast(pstr_pointer)) -#define F(string_literal) (FPSTR(PSTR(string_literal))) +#define F(string_literal) (reinterpret_cast(PSTR(string_literal))) // The string class class String {