8000 fix problems with ESP8266 core version 2.0.0 · robokoding/arduinoWebSockets@92a63e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 92a63e9

Browse files
Links2004Links2004
committed
fix problems with ESP8266 core version 2.0.0
1 parent 082f519 commit 92a63e9

File tree

5 files changed

+23
-3
lines changed

5 files changed

+23
-3
lines changed

‎src/WebSockets.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,16 @@
2424

2525
#include "WebSockets.h"
2626

27+
#ifdef ESP8266
28+
#include <core_esp8266_features.h>
29+
#endif
30+
2731
extern "C" {
28-
#include "libb64/cencode.h"
32+
#ifdef CORE_HAS_LIBB64
33+
#include <libb64/cencode.h>
34+
#else
35+
#include "libb64/cencode_inc.h"
36+
#endif
2937
}
3038

3139
#ifdef ESP8266

‎src/libb64/cdecode.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ This is part of the libb64 project, and has been placed in the public domain.
55
For details, see http://sourceforge.net/projects/libb64
66
*/
77

8-
#include "cdecode.h"
8+
#ifdef ESP8266
9+
#include <core_esp8266_features.h>
10+
#endif
11+
12+
#ifndef CORE_HAS_LIBB64
13+
#include "cdecode_inc.h"
914

1015
int base64_decode_value(char value_in)
1116
{
@@ -86,3 +91,4 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
8691
return plainchar - plaintext_out;
8792
}
8893

94+
#endif

‎src/libb64/cdecode.h renamed to ‎src/libb64/cdecode_inc.h

File renamed without changes.

‎src/libb64/cencode.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ This is part of the libb64 project, and has been placed in the public domain.
55
For details, see http://sourceforge.net/projects/libb64
66
*/
77

8-
#include "cencode.h"
8+
#ifdef ESP8266
9+
#include <core_esp8266_features.h>
10+
#endif
11+
12+
#ifndef CORE_HAS_LIBB64
13+
#include "cencode_inc.h"
914

1015
const int CHARS_PER_LINE = 72;
1116

@@ -107,3 +112,4 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
107112
return codechar - code_out;
108113
}
109114

115+
#endif

‎src/libb64/cencode.h renamed to ‎src/libb64/cencode_inc.h

File renamed without changes.

0 commit comments

Comments
 (0)
0