Skip to content

Commit 7935bed

Browse files
authored
Provide wl_tcp_state as tcp_state alias (#8609)
1 parent 8048ea5 commit 7935bed

File tree

6 files changed

+3
-24
lines changed

6 files changed

+3
-24
lines changed

Diff for: cores/esp8266/wl_definitions.h

+3-15
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,8 @@ enum wl_enc_type { /* Values map to 802.11 encryption suites... */
6969
ENC_TYPE_AUTO = 8
7070
};
7171

72-
#if !defined(LWIP_INTERNAL) && !defined(__LWIP_TCP_H__) && !defined(LWIP_HDR_TCPBASE_H)
73-
enum wl_tcp_state {
74-
CLOSED = 0,
75-
LISTEN = 1,
76-
SYN_SENT = 2,
77-
SYN_RCVD = 3,
78-
ESTABLISHED = 4,
79-
FIN_WAIT_1 = 5,
80-
FIN_WAIT_2 = 6,
81-
CLOSE_WAIT = 7,
82-
CLOSING = 8,
83-
LAST_ACK = 9,
84-
TIME_WAIT = 10
85-
};
86-
#endif
72+
#include <lwip/init.h>
73+
#include <lwip/tcpbase.h>
74+
using wl_tcp_state = tcp_state;
8775

8876
#endif /* WL_DEFINITIONS_H_ */

Diff for: libraries/ESP8266WiFi/src/WiFiClient.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

23-
#define LWIP_INTERNAL
24-
2523
extern "C"
2624
{
2725
#include "wl_definitions.h"

Diff for: libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

23-
#define LWIP_INTERNAL
24-
2523
#include <list>
2624
#include <errno.h>
2725
#include <algorithm>

Diff for: libraries/ESP8266WiFi/src/WiFiServer.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
*/
2222

2323

24-
#define LWIP_INTERNAL
25-
2624
extern "C" {
2725
#include "osapi.h"
2826
#include "ets_sys.h"

Diff for: libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
2121

22-
#define LWIP_INTERNAL
23-
2422
extern "C" {
2523
#include "osapi.h"
2624
#include "ets_sys.h"

Diff for: libraries/ESP8266WiFi/src/WiFiUdp.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2121
*/
2222

23-
#define LWIP_INTERNAL
2423
#include <functional>
2524

2625
extern "C"

0 commit comments

Comments
 (0)