Merge remote-tracking branch 'upstream/esp8266'

kaveshan1 · Mar 31, 2015 · 69b4582 · 69b4582
2 parents de29a7c + 3278e1a
commit 69b4582
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/esp8266com/esp8266/cores/esp8266/WString.h b/esp8266com/esp8266/cores/esp8266/WString.h
@@ -32,6 +32,9 @@
 // result objects are assumed to be writable by subsequent concatenations.
 class StringSumHelper;
 
+typedef char* __FlashStringHelper;
+#define F(str) str
+
 // The string class
 class String
 {