Skip to content

Commit 0fd1201

Browse files
author
Me No Dev
committed
fix tcp status redefinition and bad mem definitions in lwip
1 parent a33dba0 commit 0fd1201

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

libraries/ESP8266WiFi/src/include/wl_definitions.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,4 @@ enum wl_enc_type { /* Values map to 802.11 encryption suites... */
6868
ENC_TYPE_AUTO = 8
6969
};
7070

71-
#if !defined(LWIP_INTERNAL)
72-
enum wl_tcp_state {
73-
CLOSED = 0,
74-
LISTEN = 1,
75-
SYN_SENT = 2,
76-
SYN_RCVD = 3,
77-
ESTABLISHED = 4,
78-
FIN_WAIT_1 = 5,
79-
FIN_WAIT_2 = 6,
80-
CLOSE_WAIT = 7,
81-
CLOSING = 8,
82-
LAST_ACK = 9,
83-
TIME_WAIT = 10
84-
};
85-
#endif
86-
8771
#endif /* WL_DEFINITIONS_H_ */

libraries/ESP8266WiFi/src/lwip/mem.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ typedef size_t mem_size_t;
5151
* allow these defines to be overridden.
5252
*/
5353
#ifndef mem_free
54-
#define mem_free(p) vPortFree(p, "", 0)
54+
#define mem_free(p) vPortFree(p)
5555
#endif
5656
#ifndef mem_malloc
57-
#define mem_malloc(s) pvPortMalloc(s, "", 0)
57+
#define mem_malloc(s) pvPortMalloc(s)
5858
#endif
5959
#ifndef mem_calloc
60-
#define mem_calloc(s) pvPortCalloc(s, "", 0)
60+
#define mem_calloc(s) pvPortCalloc(s)
6161
#endif
6262
#ifndef mem_realloc
63-
#define mem_realloc(p, s) pvPortRealloc(p, s, "", 0)
63+
#define mem_realloc(p, s) pvPortRealloc(p, s)
6464
#endif
6565
#ifndef mem_zalloc
66-
#define mem_zalloc(s) pvPortZalloc(s, "", 0)
66+
#define mem_zalloc(s) pvPortZalloc(s)
6767
#endif
6868

6969
#ifndef os_malloc

0 commit comments

Comments
 (0)