fix problems with ESP8266 core version 2.0.0

This commit is contained in:
Markus Sattler
2015-11-30 19:46:37 +01:00
parent 082f5192c0
commit 92a63e9129
5 changed files with 23 additions and 3 deletions

View File

@ -24,8 +24,16 @@
#include "WebSockets.h" #include "WebSockets.h"
#ifdef ESP8266
#include <core_esp8266_features.h>
#endif
extern "C" { extern "C" {
#include "libb64/cencode.h" #ifdef CORE_HAS_LIBB64
#include <libb64/cencode.h>
#else
#include "libb64/cencode_inc.h"
#endif
} }
#ifdef ESP8266 #ifdef ESP8266

View File

@ -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 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) 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; return plainchar - plaintext_out;
} }
#endif

View File

@ -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 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; 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; return codechar - code_out;
} }
#endif