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

Merge remote-tracking branch 'esp8266/master'

Browse Source 
# Conflicts:
#	libraries/ESP8266WiFi/src/include/wl_definitions.h
This commit is contained in:
Me No Dev 2015-12-22 13:29:56 +02:00
commit 2067152238
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,8 +68,7 @@ enum wl_enc_type { /* Values map to 802.11 encryption suites... */
ENC_TYPE_AUTO = 8 ENC_TYPE_AUTO = 8
}; };
#ifndef __LWIP_TCP_H__ #if !defined(LWIP_INTERNAL) && !defined(__LWIP_TCP_H__)
#ifndef LWIP_INTERNAL
enum wl_tcp_state { enum wl_tcp_state {
CLOSED = 0, CLOSED = 0,
LISTEN = 1, LISTEN = 1,