arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-22 21:23:07 +03:00
Code

fix tcp status redefinition and bad mem definitions in lwip

Browse Source
This commit is contained in:
Me No Dev 2015-12-21 14:47:48 +02:00
parent a33dba099f
commit 0fd1201633
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/ESP8266WiFi/src/include/wl_definitions.h
View File

@ -68,20 +68,4 @@ enum wl_enc_type { /* Values map to 802.11 encryption suites... */
ENC_TYPE_AUTO = 8 ENC_TYPE_AUTO = 8
}; };
#if !defined(LWIP_INTERNAL)
enum wl_tcp_state {
CLOSED = 0,
LISTEN = 1,
SYN_SENT = 2,
SYN_RCVD = 3,
ESTABLISHED = 4,
FIN_WAIT_1 = 5,
FIN_WAIT_2 = 6,
CLOSE_WAIT = 7,
CLOSING = 8,
LAST_ACK = 9,
TIME_WAIT = 10
};
#endif
#endif /* WL_DEFINITIONS_H_ */ #endif /* WL_DEFINITIONS_H_ */

10
libraries/ESP8266WiFi/src/lwip/mem.h
View File

@ -51,19 +51,19 @@ typedef size_t mem_size_t;
* allow these defines to be overridden. * allow these defines to be overridden.
*/ */
#ifndef mem_free #ifndef mem_free
#define mem_free(p) vPortFree(p, "", 0) #define mem_free(p) vPortFree(p)
#endif #endif
#ifndef mem_malloc #ifndef mem_malloc
#define mem_malloc(s) pvPortMalloc(s, "", 0) #define mem_malloc(s) pvPortMalloc(s)
#endif #endif
#ifndef mem_calloc #ifndef mem_calloc
#define mem_calloc(s) pvPortCalloc(s, "", 0) #define mem_calloc(s) pvPortCalloc(s)
#endif #endif
#ifndef mem_realloc #ifndef mem_realloc
#define mem_realloc(p, s) pvPortRealloc(p, s, "", 0) #define mem_realloc(p, s) pvPortRealloc(p, s)
#endif #endif
#ifndef mem_zalloc #ifndef mem_zalloc
#define mem_zalloc(s) pvPortZalloc(s, "", 0) #define mem_zalloc(s) pvPortZalloc(s)
#endif #endif
#ifndef os_malloc #ifndef os_malloc