Skip to content

GitLab

A
arduino-esp32
Commit d13de284 authored by Earle F. Philhower, III's avatar Earle F. Philhower, III Committed by Me No Dev
Browse files
Options

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

Fixes Arduino.h redefinition errors.
parent 697d4ff7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
cores/esp32/WString.h
View file @ d13de284
......@@ -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<const __FlashStringHelper *>(pstr_pointer))
#define F(string_literal) (FPSTR(PSTR(string_literal)))
#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
// The string class
class String {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment