From c418bac33c7b7041dcbf359878057a8ed5e7541e Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Thu, 18 Dec 2014 18:45:22 +0300
Subject: [PATCH] Clean up ets_printf declarations

---
 hardware/arduino/esp8266/cores/esp8266/core_esp8266_main.cpp | 1 +
 hardware/arduino/esp8266/cores/esp8266/debug.h               | 1 -
 .../esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp        | 1 -
 .../arduino/esp8266/libraries/ESP8266WiFi/src/WiFiClient.cpp | 2 ++
 .../arduino/esp8266/libraries/ESP8266WiFi/src/WiFiServer.cpp | 5 +++++
 hardware/arduino/esp8266/libraries/Wire/utility/i2c.cpp      | 4 +---
 hardware/tools/esp8266/sdk/include/ets_sys.h                 | 2 +-
 hardware/tools/esp8266/sdk/include/osapi.h                   | 1 +
 8 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/hardware/arduino/esp8266/cores/esp8266/core_esp8266_main.cpp b/hardware/arduino/esp8266/cores/esp8266/core_esp8266_main.cpp
index 4d69c2f48..072baf933 100644
--- a/hardware/arduino/esp8266/cores/esp8266/core_esp8266_main.cpp
+++ b/hardware/arduino/esp8266/cores/esp8266/core_esp8266_main.cpp
@@ -86,6 +86,7 @@ static void loop_task(os_event_t *events)
     cont_run(&g_cont, &loop_wrapper);
     if (cont_check(&g_cont) != 0)
     {
+        ets_printf("\r\nheap collided with sketch stack\r\n");
         abort();
     }
 }
diff --git a/hardware/arduino/esp8266/cores/esp8266/debug.h b/hardware/arduino/esp8266/cores/esp8266/debug.h
index 902fc7176..24f3cb983 100644
--- a/hardware/arduino/esp8266/cores/esp8266/debug.h
+++ b/hardware/arduino/esp8266/cores/esp8266/debug.h
@@ -3,7 +3,6 @@
 
 #include <stddef.h>
 
-extern "C" size_t ets_printf(const char*, ...);
 #define DEBUGV ets_printf
 
 
diff --git a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
index ac55dbe53..24f743ac0 100644
--- a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
+++ b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -34,7 +34,6 @@ extern "C" {
 extern "C" void esp_schedule();
 extern "C" void esp_yield();
 
-
 ESP8266WiFiClass::ESP8266WiFiClass()
 {
 
diff --git a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/WiFiClient.cpp b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/WiFiClient.cpp
index 214af4e73..fcb30ccd6 100644
--- a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/WiFiClient.cpp
+++ b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -22,6 +22,8 @@
 extern "C" 
 {
     #include "include/wl_definitions.h"
+    #include "osapi.h"
+    #include "ets_sys.h"
 }
 
 #include "debug.h"
diff --git a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/WiFiServer.cpp b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/WiFiServer.cpp
index 2b9adcc61..eb222c965 100644
--- a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/WiFiServer.cpp
+++ b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/WiFiServer.cpp
@@ -19,6 +19,11 @@
 
 #define LWIP_INTERNAL
 
+extern "C" {
+    #include "osapi.h"
+    #include "ets_sys.h"
+}
+
 #include "debug.h"
 #include "ESP8266WiFi.h"
 #include "WiFiClient.h"
diff --git a/hardware/arduino/esp8266/libraries/Wire/utility/i2c.cpp b/hardware/arduino/esp8266/libraries/Wire/utility/i2c.cpp
index e2ce0bb18..dc2e54902 100644
--- a/hardware/arduino/esp8266/libraries/Wire/utility/i2c.cpp
+++ b/hardware/arduino/esp8266/libraries/Wire/utility/i2c.cpp
@@ -5,9 +5,7 @@ extern "C" {
 #include "ets_sys.h"
 #include "osapi.h"
 #include "gpio.h"
-
-size_t ets_printf(const char*, ...);
-#define DEBUGV ets_printf
+#include "debug.h"
 }
 
 static uint8_t s_sda_pin = 0;
diff --git a/hardware/tools/esp8266/sdk/include/ets_sys.h b/hardware/tools/esp8266/sdk/include/ets_sys.h
index a1328388a..8080f75e0 100644
--- a/hardware/tools/esp8266/sdk/include/ets_sys.h
+++ b/hardware/tools/esp8266/sdk/include/ets_sys.h
@@ -101,7 +101,7 @@ char *ets_strncpy(char *dest, const char *src, size_t n);
 char *ets_strstr(const char *haystack, const char *needle);
 int ets_sprintf(char *str, const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
 int os_snprintf(char *str, size_t size, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
-int os_printf(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
+int ets_printf(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
 void ets_install_putc1(void* routine);
 void uart_div_modify(int no, int freq);
 void ets_isr_mask(int intr);
diff --git a/hardware/tools/esp8266/sdk/include/osapi.h b/hardware/tools/esp8266/sdk/include/osapi.h
index 055085f0d..51c185f6e 100644
--- a/hardware/tools/esp8266/sdk/include/osapi.h
+++ b/hardware/tools/esp8266/sdk/include/osapi.h
@@ -42,6 +42,7 @@
 #define os_timer_setfn ets_timer_setfn
 
 #define os_sprintf  ets_sprintf
+#define os_printf  ets_printf
 #define os_update_cpu_frequency ets_update_cpu_frequency
 
 #endif