From 36d6869e653122e296ebf752c218d8055927a74f Mon Sep 17 00:00:00 2001 From: "Dirk O. Kaar" Date: Tue, 25 Apr 2023 21:00:25 +0200 Subject: [PATCH] Revert macros in #7941, but simplify. --- cores/esp32/WString.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp32/WString.h b/cores/esp32/WString.h index 261868bc9aa..9dd58fb6574 100644 --- a/cores/esp32/WString.h +++ b/cores/esp32/WString.h @@ -34,8 +34,8 @@ // A pure abstract class forward used as a means to proide a unique pointer type // but really is never defined. class __FlashStringHelper; -#define FPSTR(pstr_pointer) (pstr_pointer) -#define F(string_literal) (string_literal) +#define FPSTR(str_pointer) (reinterpret_cast(str_pointer)) +#define F(string_literal) (FPSTR(string_literal)) // An inherited class for holding the result of a concatenation. These // result objects are assumed to be writable by subsequent concatenations.