abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-09 17:13:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug #43235, checking for non-existent preprocessor macros is non-standard, added predefinition for all affected macros

Browse Source
This commit is contained in:
Sylvain Rochet
2014-10-12 20:51:58 +02:00
parent da19974e81
commit 60f920df0e
5 changed files with 90 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/netif/ppp/ipv6cp.c
View File

@@ -270,9 +270,9 @@ static int ipv6_demand_conf(int u);
static int ipv6cp_printpkt(u_char *p, int plen,
void (*printer)(void *, char *, ...), void *arg);
#endif /* PRINTPKT_SUPPORT */
#if PPP_DEMAND
#if DEMAND_SUPPORT
static int ipv6_active_pkt(u_char *pkt, int len);
#endif /* PPP_DEMAND */
#endif /* DEMAND_SUPPORT */
const struct protent ipv6cp_protent = {
PPP_IPV6CP,
@@ -1035,7 +1035,7 @@ endswitch:
return (rc); /* Return final code */
}
#if PPP_OPTION
#if PPP_OPTIONS
/*
* ipv6_check_options - check that any IP-related options are OK,
* and assign appropriate defaults.
@@ -1092,7 +1092,7 @@ static void ipv6_check_options() {
exit(1);
}
}
#endif /* PPP_OPTION */
#endif /* PPP_OPTIONS */
#if DEMAND_SUPPORT
/*
@@ -1271,7 +1271,7 @@ static void ipv6cp_down(fsm *f) {
sif6comp(f->unit, 0);
#endif
#if PPP_DEMAND
#if DEMAND_SUPPORT
/*
* If we are doing dial-on-demand, set the interface
* to queue up outgoing packets (for now).
@@ -1279,7 +1279,7 @@ static void ipv6cp_down(fsm *f) {
if (demand) {
sifnpmode(f->pcb, PPP_IPV6, NPMODE_QUEUE);
} else
#endif /* PPP_DEMAND */
#endif /* DEMAND_SUPPORT */
{
sifnpmode(f->pcb, PPP_IPV6, NPMODE_DROP);
ipv6cp_clear_addrs(f->pcb,
@@ -1464,7 +1464,7 @@ static int ipv6cp_printpkt(u_char *p, int plen,
}
#endif /* PRINTPKT_SUPPORT */
#if PPP_DEMAND
#if DEMAND_SUPPORT
/*
* ipv6_active_pkt - see if this IP packet is worth bringing the link up for.
* We don't bring the link up for IP fragments or for TCP FIN packets
@@ -1502,6 +1502,6 @@ static int ipv6_active_pkt(u_char *pkt, int len) {
return 0;
return 1;
}
#endif /* PPP_DEMAND */
#endif /* DEMAND_SUPPORT */
#endif /* PPP_SUPPORT && PPP_IPV6_SUPPORT */

2
src/netif/ppp/multilink.c
View File

@@ -29,7 +29,7 @@
*/
#include "lwip/opt.h"
#if PPP_SUPPORT && HAVE_MULTILINK /* don't build if not configured for use in lwipopts.h */
#if PPP_SUPPORT && defined(HAVE_MULTILINK) /* don't build if not configured for use in lwipopts.h */
/* Multilink support
*

2
src/netif/ppp/ppp.c
View File

@@ -602,7 +602,7 @@ static void ppp_clear(ppp_pcb *pcb) {
LWIP_ASSERT("pcb->phase == PPP_PHASE_DEAD || pcb->phase == PPP_PHASE_HOLDOFF", pcb->phase == PPP_PHASE_DEAD || pcb->phase == PPP_PHASE_HOLDOFF);
#if PPP_STATS_SUPPORTs
#if PPP_STATS_SUPPORT
link_stats_valid = 0;
#endif /* PPP_STATS_SUPPORT */