mirror of
https://github.com/cesanta/mongoose.git
synced 2024-12-28 07:28:13 +08:00
Merge pull request #2687 from cesanta/shh
Keepup with Zephyr project's enjoyment of changing headers
This commit is contained in:
commit
e6663ec186
@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
|
||||
CONFIG_NET_DHCPV4=y
|
||||
CONFIG_NET_SOCKETS=y
|
||||
CONFIG_NET_SOCKETS_POLL_MAX=32
|
||||
CONFIG_POSIX_API=y
|
||||
CONFIG_POSIX_MAX_FDS=32
|
||||
CONFIG_NET_MAX_CONN=10
|
||||
CONFIG_NET_MAX_CONTEXTS=10
|
||||
|
@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
|
||||
CONFIG_NET_DHCPV4=y
|
||||
CONFIG_NET_SOCKETS=y
|
||||
CONFIG_NET_SOCKETS_POLL_MAX=32
|
||||
CONFIG_POSIX_API=y
|
||||
CONFIG_POSIX_MAX_FDS=32
|
||||
CONFIG_NET_CONFIG_SETTINGS=y
|
||||
CONFIG_NET_CONNECTION_MANAGER=y
|
||||
|
@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
|
||||
CONFIG_NET_DHCPV4=y
|
||||
CONFIG_NET_SOCKETS=y
|
||||
CONFIG_NET_SOCKETS_POLL_MAX=32
|
||||
CONFIG_POSIX_API=y
|
||||
CONFIG_POSIX_MAX_FDS=32
|
||||
CONFIG_NET_CONFIG_SETTINGS=y
|
||||
CONFIG_NET_CONNECTION_MANAGER=y
|
||||
|
@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
|
||||
CONFIG_NET_DHCPV4=y
|
||||
CONFIG_NET_SOCKETS=y
|
||||
CONFIG_NET_SOCKETS_POLL_MAX=32
|
||||
CONFIG_POSIX_API=y
|
||||
CONFIG_POSIX_MAX_FDS=32
|
||||
CONFIG_NET_CONFIG_SETTINGS=y
|
||||
CONFIG_NET_CONNECTION_MANAGER=y
|
||||
|
@ -6,6 +6,7 @@ CONFIG_NET_UDP=y
|
||||
CONFIG_NET_DHCPV4=y
|
||||
CONFIG_NET_SOCKETS=y
|
||||
CONFIG_NET_SOCKETS_POLL_MAX=32
|
||||
CONFIG_POSIX_API=y
|
||||
CONFIG_POSIX_MAX_FDS=32
|
||||
CONFIG_NET_CONFIG_SETTINGS=y
|
||||
CONFIG_NET_CONNECTION_MANAGER=y
|
||||
|
11
mongoose.h
11
mongoose.h
@ -522,8 +522,9 @@ typedef int socklen_t;
|
||||
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <zephyr/posix/fcntl.h>
|
||||
#include <zephyr/net/socket.h>
|
||||
#include <zephyr/posix/fcntl.h>
|
||||
#include <zephyr/posix/sys/select.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
@ -2919,6 +2920,14 @@ struct mg_tcpip_driver_tm4c_data {
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_W5500) && MG_ENABLE_DRIVER_W5500
|
||||
|
||||
#undef MG_ENABLE_TCPIP_DRIVER_INIT
|
||||
#define MG_ENABLE_TCPIP_DRIVER_INIT 0
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
@ -6,8 +6,9 @@
|
||||
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <zephyr/posix/fcntl.h>
|
||||
#include <zephyr/net/socket.h>
|
||||
#include <zephyr/posix/fcntl.h>
|
||||
#include <zephyr/posix/sys/select.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user