From b500a1f26a2df8cd06b32d9846c2d526a41eb921 Mon Sep 17 00:00:00 2001
From: Neil Kolban <kolban1@kolban.com>
Date: Sun, 9 Aug 2015 14:10:20 -0500
Subject: [PATCH] Made changes to allow the compiler to compile without
 warnings.

---
 cores/esp8266/Tone.cpp                  | 2 ++
 cores/esp8266/Updater.h                 | 2 +-
 cores/esp8266/cbuf.h                    | 4 ++--
 cores/esp8266/core_esp8266_postmortem.c | 4 +++-
 cores/esp8266/core_esp8266_si2c.c       | 3 +++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cores/esp8266/Tone.cpp b/cores/esp8266/Tone.cpp
index f85ed404a..c704c50aa 100644
--- a/cores/esp8266/Tone.cpp
+++ b/cores/esp8266/Tone.cpp
@@ -35,10 +35,12 @@
 #include "Arduino.h"
 #include "pins_arduino.h"
 
+/*
 static int8_t toneBegin(uint8_t _pin) {
     //TODO implement tone
     return 0;
 }
+*/
 
 void tone(uint8_t _pin, unsigned int frequency, unsigned long duration) {
     //TODO implement tone
diff --git a/cores/esp8266/Updater.h b/cores/esp8266/Updater.h
index be1a04dd6..eac84f466 100644
--- a/cores/esp8266/Updater.h
+++ b/cores/esp8266/Updater.h
@@ -108,12 +108,12 @@ class UpdaterClass {
     void _reset();
     bool _writeBuffer();
 
+    uint8_t _error;
     uint8_t *_buffer;
     size_t _bufferLen;
     size_t _size;
     uint32_t _startAddress;
     uint32_t _currentAddress;
-    uint8_t _error;
 };
 
 extern UpdaterClass Update;
diff --git a/cores/esp8266/cbuf.h b/cores/esp8266/cbuf.h
index ceb6a7b6d..728547fad 100644
--- a/cores/esp8266/cbuf.h
+++ b/cores/esp8266/cbuf.h
@@ -70,7 +70,7 @@ class cbuf {
             size_t bytes_available = getSize();
             size_t size_to_read = (size < bytes_available) ? size : bytes_available;
             size_t size_read = size_to_read;
-            if(_end < _begin && size_to_read > _bufend - _begin) {
+            if(_end < _begin && size_to_read > (size_t)(_bufend - _begin)) {
                 size_t top_size = _bufend - _begin;
                 memcpy(dst, _begin, top_size);
                 _begin = _buf;
@@ -95,7 +95,7 @@ class cbuf {
             size_t bytes_available = room();
             size_t size_to_write = (size < bytes_available) ? size : bytes_available;
             size_t size_written = size_to_write;
-            if(_end > _begin && size_to_write > _bufend - _end) {
+            if(_end > _begin && size_to_write > (size_t)(_bufend - _end)) {
                 size_t top_size = _bufend - _end;
                 memcpy(_end, src, top_size);
                 _end = _buf;
diff --git a/cores/esp8266/core_esp8266_postmortem.c b/cores/esp8266/core_esp8266_postmortem.c
index f5ede6c76..c34e5918d 100644
--- a/cores/esp8266/core_esp8266_postmortem.c
+++ b/cores/esp8266/core_esp8266_postmortem.c
@@ -35,7 +35,7 @@ static void uart_write_char_d(char c);
 static void uart0_write_char_d(char c);
 static void uart1_write_char_d(char c);
 static void print_stack(uint32_t start, uint32_t end);
-static void print_pcs(uint32_t start, uint32_t end);
+//static void print_pcs(uint32_t start, uint32_t end);
 
 void __wrap_system_restart_local() {
     register uint32_t sp asm("a1");
@@ -108,6 +108,7 @@ static void print_stack(uint32_t start, uint32_t end) {
     ets_printf("<<<stack<<<\n");
 }
 
+/*
 static void print_pcs(uint32_t start, uint32_t end) {
     uint32_t n = 0;
     ets_printf("\n>>>pc>>>\n");
@@ -122,6 +123,7 @@ static void print_pcs(uint32_t start, uint32_t end) {
     }
     ets_printf("<<<pc<<<\n");
 }
+*/
 
 void uart_write_char_d(char c) {
     uart0_write_char_d(c);
diff --git a/cores/esp8266/core_esp8266_si2c.c b/cores/esp8266/core_esp8266_si2c.c
index 3dd791dc7..1db11bb87 100644
--- a/cores/esp8266/core_esp8266_si2c.c
+++ b/cores/esp8266/core_esp8266_si2c.c
@@ -75,8 +75,11 @@ void twi_stop(void){
 
 static void twi_delay(unsigned char v){
   unsigned int i;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
   unsigned int reg;
   for(i=0;i<v;i++) reg = GPI;
+#pragma GCC diagnostic pop
 }
 
 static bool twi_write_start(void) {