From 129175c1bcb1851fcd812ed078fed07eb3d7368f Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Tue, 21 Apr 2015 18:34:23 +0200
Subject: [PATCH] add prototypes for ets_vsnprintf and ets_vprintf fix some
 compiler warnings

---
 hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h | 12 +++++++++++-
 hardware/tools/esp8266/sdk/include/c_types.h         |  5 +++--
 hardware/tools/esp8266/sdk/include/ets_sys.h         |  3 ++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h b/hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h
index 4b0b0dd72..77ad5decc 100644
--- a/hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h
+++ b/hardware/esp8266com/esp8266/cores/esp8266/pgmspace.h
@@ -1,14 +1,24 @@
 #ifndef __PGMSPACE_H_
 #define __PGMSPACE_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include <stdint.h>
+#include <stdio.h>
+#include "ets_sys.h"
+#include "osapi.h"
+#ifdef __cplusplus
+}
+#endif
 
 #define PROGMEM
 #define PGM_P  		const char *
 #define PSTR(str) 	(str)
 
-#define vsnprintf_P(...) 	vsnprintf( __VA_ARGS__ )
+#define vsnprintf_P(...) 	ets_vsnprintf( __VA_ARGS__ )
 #define snprintf_P(...) 	snprintf( __VA_ARGS__ )
+#define printf_P(...)       os_printf(__VA_ARGS__)
 
 #define _SFR_BYTE(n) (n)
 
diff --git a/hardware/tools/esp8266/sdk/include/c_types.h b/hardware/tools/esp8266/sdk/include/c_types.h
index c45ba9c56..df3739e4b 100644
--- a/hardware/tools/esp8266/sdk/include/c_types.h
+++ b/hardware/tools/esp8266/sdk/include/c_types.h
@@ -7,6 +7,7 @@
 #define _C_TYPES_H_
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdarg.h>
 
 typedef signed char         sint8_t;
 typedef signed short        sint16_t;
@@ -75,8 +76,8 @@ typedef enum {
 #ifndef __cplusplus
 //typedef unsigned char   bool;
 #define BOOL            bool
-#define true            (1)
-#define false           (0)
+//#define true            (1)
+//#define false           (0)
 #define TRUE            true
 #define FALSE           false
 
diff --git a/hardware/tools/esp8266/sdk/include/ets_sys.h b/hardware/tools/esp8266/sdk/include/ets_sys.h
index 2244240af..b7b79c341 100644
--- a/hardware/tools/esp8266/sdk/include/ets_sys.h
+++ b/hardware/tools/esp8266/sdk/include/ets_sys.h
@@ -118,6 +118,7 @@ void ets_isr_unmask(int intr);
 void ets_isr_attach(int intr, int_handler_t handler, void *arg);
 void ets_intr_lock();
 void ets_intr_unlock();
-
+int ets_vsnprintf(char * s, size_t n, const char * format, va_list arg);
+int ets_vprintf(const char * format, va_list arg);
 
 #endif /* _ETS_SYS_H */