From 1fef434f01a752ab05e5f050cc1b65dcc01da929 Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Thu, 1 Oct 2015 10:49:28 +0200 Subject: [PATCH] PPP: Fix shadowing of global declaration Older compilers (GCC 4.6) don't like variables with the same name as global functions: lwip/src/netif/ppp/lcp.c: In function 'lcp_received_echo_reply': lwip/src/netif/ppp/lcp.c:2685:11: error: declaration of 'magic' shadows a global declaration [-Werror=shadow] lwip/src/include/netif/ppp/magic.h:101:7: error: shadowed declaration is here [-Werror=shadow] magic.h contains a function named magic(), so rename the variable. --- src/netif/ppp/lcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/netif/ppp/lcp.c b/src/netif/ppp/lcp.c index ab1196c2..1e479806 100644 --- a/src/netif/ppp/lcp.c +++ b/src/netif/ppp/lcp.c @@ -2682,7 +2682,7 @@ static void LcpEchoTimeout(void *arg) { static void lcp_received_echo_reply(fsm *f, int id, u_char *inp, int len) { ppp_pcb *pcb = f->pcb; lcp_options *go = &pcb->lcp_gotoptions; - u32_t magic; + u32_t magic_val; LWIP_UNUSED_ARG(id); /* Check the magic number - don't count replies from ourselves. */ @@ -2690,9 +2690,9 @@ static void lcp_received_echo_reply(fsm *f, int id, u_char *inp, int len) { ppp_dbglog("lcp: received short Echo-Reply, length %d", len); return; } - GETLONG(magic, inp); + GETLONG(magic_val, inp); if (go->neg_magicnumber - && magic == go->magicnumber) { + && magic_val == go->magicnumber) { ppp_warn("appear to have received our own echo-reply!"); return; }