[ros-diffs] [reactos] 01/01: [LWIP] Fix src/core/init.c a bit (#1620)

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a98d96eac606d3fc258e…

commit 3a98d96eac606d3fc258ef298b80a71f00d96188
Author:     Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com>
AuthorDate: Thu Jun 6 01:51:46 2019 +0200
Commit:     Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Thu Jun 6 01:51:46 2019 +0200

    [LWIP] Fix src/core/init.c a bit (#1620)
    
    Cherry-pick
   
http://git.savannah.nongnu.org/cgit/lwip.git/commit/src/core/init.c?id=c0b5…
---
 sdk/lib/drivers/lwip/src/core/init.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sdk/lib/drivers/lwip/src/core/init.c b/sdk/lib/drivers/lwip/src/core/init.c
index a7b15a776ab..691bdcaaf60 100644
--- a/sdk/lib/drivers/lwip/src/core/init.c
+++ b/sdk/lib/drivers/lwip/src/core/init.c
@@ -70,9 +70,6 @@
 #if (!LWIP_UDP && LWIP_UDPLITE)
   #error "If you want to use UDP Lite, you have to define LWIP_UDP=1 in your
lwipopts.h"
 #endif
-#if (!LWIP_UDP && LWIP_SNMP)
-  #error "If you want to use SNMP, you have to define LWIP_UDP=1 in your
lwipopts.h"
-#endif
 #if (!LWIP_UDP && LWIP_DHCP)
   #error "If you want to use DHCP, you have to define LWIP_UDP=1 in your
lwipopts.h"
 #endif
@@ -124,7 +121,7 @@
 #if (LWIP_TCP && ((TCP_MAXRTX > 12) || (TCP_SYNMAXRTX > 12)))
   #error "If you want to use TCP, TCP_MAXRTX and TCP_SYNMAXRTX must less or equal to
12 (due to tcp_backoff table), so, you have to reduce them in your lwipopts.h"
 #endif
-#if (LWIP_TCP && TCP_LISTEN_BACKLOG && (TCP_DEFAULT_LISTEN_BACKLOG <
0) || (TCP_DEFAULT_LISTEN_BACKLOG > 0xff))
+#if (LWIP_TCP && TCP_LISTEN_BACKLOG && ((TCP_DEFAULT_LISTEN_BACKLOG <
0) || (TCP_DEFAULT_LISTEN_BACKLOG > 0xff)))
   #error "If you want to use TCP backlog, TCP_DEFAULT_LISTEN_BACKLOG must fit into
an u8_t"
 #endif
 #if (LWIP_NETIF_API && (NO_SYS==1))
@@ -166,7 +163,7 @@
 #if (DNS_LOCAL_HOSTLIST && !DNS_LOCAL_HOSTLIST_IS_DYNAMIC &&
!(defined(DNS_LOCAL_HOSTLIST_INIT)))
   #error "you have to define define DNS_LOCAL_HOSTLIST_INIT {{'host1',
0x123}, {'host2', 0x234}} to initialize DNS_LOCAL_HOSTLIST"
 #endif
-#if PPP_SUPPORT && !PPPOS_SUPPORT & !PPPOE_SUPPORT
+#if PPP_SUPPORT && !PPPOS_SUPPORT && !PPPOE_SUPPORT
   #error "PPP_SUPPORT needs either PPPOS_SUPPORT or PPPOE_SUPPORT turned on"
 #endif
 #if !LWIP_ETHERNET && (LWIP_ARP || PPPOE_SUPPORT)