From 135631d29db5efb1e58af7d3f76bad6f5bc5c514 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Thu, 9 Apr 2015 23:27:36 +0200
Subject: [PATCH] fixed some obvious compiler warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

lwip/src/include/lwip/autoip.h:52:1: error: C++ style comments are not allowed in ISO C90 [-Werror]
 //#include "lwip/udp.h"

lwip/src/core/ipv4/autoip.c:70:1: error: C++ style comments are not allowed in ISO C90 [-Werror]
 //#include "lwip/udp.h"

lwip/src/include/lwip/api.h:239:25: error: declaration of ‘lev’ shadows a previous local [-Werror=shadow]
   SYS_ARCH_DECL_PROTECT(lev); \
---
 src/core/ipv4/autoip.c    | 2 +-
 src/include/lwip/api.h    | 6 +++---
 src/include/lwip/autoip.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/ipv4/autoip.c b/src/core/ipv4/autoip.c
index 6d4b21f1..1407ab9e 100644
--- a/src/core/ipv4/autoip.c
+++ b/src/core/ipv4/autoip.c
@@ -67,7 +67,7 @@
 #if LWIP_IPV4 && LWIP_AUTOIP /* don't build if not configured for use in lwipopts.h */
 
 #include "lwip/mem.h"
-//#include "lwip/udp.h"
+/* #include "lwip/udp.h" */
 #include "lwip/ip_addr.h"
 #include "lwip/netif.h"
 #include "lwip/autoip.h"
diff --git a/src/include/lwip/api.h b/src/include/lwip/api.h
index a00c4dce..821bce2d 100644
--- a/src/include/lwip/api.h
+++ b/src/include/lwip/api.h
@@ -236,12 +236,12 @@ struct netconn {
 
 /** Set conn->last_err to err but don't overwrite fatal errors */
 #define NETCONN_SET_SAFE_ERR(conn, err) do { if ((conn) != NULL) { \
-  SYS_ARCH_DECL_PROTECT(lev); \
-  SYS_ARCH_PROTECT(lev); \
+  SYS_ARCH_DECL_PROTECT(netconn_set_safe_err_lev); \
+  SYS_ARCH_PROTECT(netconn_set_safe_err_lev); \
   if (!ERR_IS_FATAL((conn)->last_err)) { \
     (conn)->last_err = err; \
   } \
-  SYS_ARCH_UNPROTECT(lev); \
+  SYS_ARCH_UNPROTECT(netconn_set_safe_err_lev); \
 }} while(0);
 
 /* Network connection functions: */
diff --git a/src/include/lwip/autoip.h b/src/include/lwip/autoip.h
index 7cec5b34..e405aa22 100644
--- a/src/include/lwip/autoip.h
+++ b/src/include/lwip/autoip.h
@@ -49,7 +49,7 @@
 #if LWIP_IPV4 && LWIP_AUTOIP /* don't build if not configured for use in lwipopts.h */
 
 #include "lwip/netif.h"
-//#include "lwip/udp.h"
+/* #include "lwip/udp.h" */
 #include "netif/etharp.h"
 
 #ifdef __cplusplus