Skip to content

Commit 2067152

Browse files
author
Me No Dev
committed
Merge remote-tracking branch 'esp8266/master'
# Conflicts: # libraries/ESP8266WiFi/src/include/wl_definitions.h
2 parents 7e8e535 + ee2d449 commit 2067152

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

libraries/ESP8266WiFi/src/include/wl_definitions.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ enum wl_enc_type { /* Values map to 802.11 encryption suites... */
6868
ENC_TYPE_AUTO = 8
6969
};
7070

71-
#ifndef __LWIP_TCP_H__
72-
#ifndef LWIP_INTERNAL
71+
#if !defined(LWIP_INTERNAL) && !defined(__LWIP_TCP_H__)
7372
enum wl_tcp_state {
7473
CLOSED = 0,
7574
LISTEN = 1,

0 commit comments

Comments
 (0)