From 92a63e9129f2a4f8c5a0e4372736f9a95a2004d9 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Mon, 30 Nov 2015 19:46:37 +0100
Subject: [PATCH] fix problems with ESP8266 core version 2.0.0

---
 src/WebSockets.cpp                      | 10 +++++++++-
 src/libb64/cdecode.c                    |  8 +++++++-
 src/libb64/{cdecode.h => cdecode_inc.h} |  0
 src/libb64/cencode.c                    |  8 +++++++-
 src/libb64/{cencode.h => cencode_inc.h} |  0
 5 files changed, 23 insertions(+), 3 deletions(-)
 rename src/libb64/{cdecode.h => cdecode_inc.h} (100%)
 rename src/libb64/{cencode.h => cencode_inc.h} (100%)

diff --git a/src/WebSockets.cpp b/src/WebSockets.cpp
index 0b5736f..b3ad336 100644
--- a/src/WebSockets.cpp
+++ b/src/WebSockets.cpp
@@ -24,8 +24,16 @@
 
 #include "WebSockets.h"
 
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
 extern "C" {
-#include "libb64/cencode.h"
+#ifdef CORE_HAS_LIBB64
+    #include <libb64/cencode.h>
+#else
+    #include "libb64/cencode_inc.h"
+#endif
 }
 
 #ifdef ESP8266
diff --git a/src/libb64/cdecode.c b/src/libb64/cdecode.c
index bb4b07c..0d86d0e 100644
--- a/src/libb64/cdecode.c
+++ b/src/libb64/cdecode.c
@@ -5,7 +5,12 @@ This is part of the libb64 project, and has been placed in the public domain.
 For details, see http://sourceforge.net/projects/libb64
 */
 
-#include "cdecode.h"
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
+#ifndef CORE_HAS_LIBB64
+#include "cdecode_inc.h"
 
 int base64_decode_value(char value_in)
 {
@@ -86,3 +91,4 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
 	return plainchar - plaintext_out;
 }
 
+#endif
diff --git a/src/libb64/cdecode.h b/src/libb64/cdecode_inc.h
similarity index 100%
rename from src/libb64/cdecode.h
rename to src/libb64/cdecode_inc.h
diff --git a/src/libb64/cencode.c b/src/libb64/cencode.c
index a15b5dc..7367135 100644
--- a/src/libb64/cencode.c
+++ b/src/libb64/cencode.c
@@ -5,7 +5,12 @@ This is part of the libb64 project, and has been placed in the public domain.
 For details, see http://sourceforge.net/projects/libb64
 */
 
-#include "cencode.h"
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
+#ifndef CORE_HAS_LIBB64
+#include "cencode_inc.h"
 
 const int CHARS_PER_LINE = 72;
 
@@ -107,3 +112,4 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
 	return codechar - code_out;
 }
 
+#endif
diff --git a/src/libb64/cencode.h b/src/libb64/cencode_inc.h
similarity index 100%
rename from src/libb64/cencode.h
rename to src/libb64/cencode_inc.h