From d1142f769908a748f2e14ac2a2b3d277ca9d65b3 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Mon, 8 Jun 2015 11:11:56 -0700 Subject: [PATCH] Wrap all pgmspace.h declarations with extern C to prevent issue with linking. --- hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h b/hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h index e6db10fbda..c24dd240e7 100644 --- a/hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h +++ b/hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h @@ -8,9 +8,6 @@ extern "C" { #include #include "ets_sys.h" #include "osapi.h" -#ifdef __cplusplus -} -#endif #define PROGMEM ICACHE_RODATA_ATTR #define PGM_P const char * @@ -90,4 +87,8 @@ int vsnprintf_P(char *str, size_t strSize, const char *formatP, va_list ap) __at #define pgm_read_dword_far(addr) pgm_read_dword(addr) #define pgm_read_float_far(addr) pgm_read_float(addr) +#ifdef __cplusplus // End extern "C" wrapper. +} +#endif + #endif //__PGMSPACE_H_