From 355b926e899aac8cdfb666b4e8d79a90b827c150 Mon Sep 17 00:00:00 2001
From: bernard <bernard.xiong@rt-thread.com>
Date: Tue, 31 Jan 2017 13:18:03 +0800
Subject: [PATCH] [lwIP] fix lwip 2.0.0 compiling issue.

---
 components/net/lwip-2.0.0/src/arch/sys_arch.c    | 2 --
 components/net/lwip-2.0.0/src/netif/ethernetif.c | 7 +++----
 components/net/lwip_dhcpd/dhcp_server.c          | 5 +++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/net/lwip-2.0.0/src/arch/sys_arch.c b/components/net/lwip-2.0.0/src/arch/sys_arch.c
index 4bbb88c836..7db873f130 100644
--- a/components/net/lwip-2.0.0/src/arch/sys_arch.c
+++ b/components/net/lwip-2.0.0/src/arch/sys_arch.c
@@ -693,9 +693,7 @@ RTM_EXPORT(lwip_ioctl);
 RTM_EXPORT(lwip_fcntl);
 
 RTM_EXPORT(lwip_htons);
-RTM_EXPORT(lwip_ntohs);
 RTM_EXPORT(lwip_htonl);
-RTM_EXPORT(lwip_ntohl);
 
 #if LWIP_DNS
 #include <lwip/netdb.h>
diff --git a/components/net/lwip-2.0.0/src/netif/ethernetif.c b/components/net/lwip-2.0.0/src/netif/ethernetif.c
index 4dd5933bf4..5b4e40ac69 100644
--- a/components/net/lwip-2.0.0/src/netif/ethernetif.c
+++ b/components/net/lwip-2.0.0/src/netif/ethernetif.c
@@ -581,7 +581,6 @@ void list_tcps(void)
     extern struct tcp_pcb *tcp_active_pcbs;
     extern union tcp_listen_pcbs_t tcp_listen_pcbs;
     extern struct tcp_pcb *tcp_tw_pcbs;
-    extern const char *tcp_state_str[];
 
     rt_enter_critical();
     rt_kprintf("Active PCB states:\n");
@@ -598,7 +597,7 @@ void list_tcps(void)
                    pcb->remote_port,
                    pcb->snd_nxt,
                    pcb->rcv_nxt);
-        rt_kprintf("state: %s\n", tcp_state_str[pcb->state]);
+        rt_kprintf("state: %s\n", tcp_debug_state_str(pcb->state));
     }
 
     rt_kprintf("Listen PCB states:\n");
@@ -606,7 +605,7 @@ void list_tcps(void)
     for(pcb = (struct tcp_pcb *)tcp_listen_pcbs.pcbs; pcb != NULL; pcb = pcb->next)
     {
         rt_kprintf("#%d local port %d ", num++, pcb->local_port);
-        rt_kprintf("state: %s\n", tcp_state_str[pcb->state]);
+        rt_kprintf("state: %s\n", tcp_debug_state_str(pcb->state));
     }
 
     rt_kprintf("TIME-WAIT PCB states:\n");
@@ -624,7 +623,7 @@ void list_tcps(void)
                    pcb->remote_port,
                    pcb->snd_nxt,
                    pcb->rcv_nxt);
-        rt_kprintf("state: %s\n", tcp_state_str[pcb->state]);
+        rt_kprintf("state: %s\n", tcp_debug_state_str(pcb->state));
     }
     rt_exit_critical();
 }
diff --git a/components/net/lwip_dhcpd/dhcp_server.c b/components/net/lwip_dhcpd/dhcp_server.c
index cb3fc0f464..4acfb9cba0 100644
--- a/components/net/lwip_dhcpd/dhcp_server.c
+++ b/components/net/lwip_dhcpd/dhcp_server.c
@@ -37,6 +37,11 @@
 #include <netif/etharp.h>
 #include <netif/ethernetif.h>
 #include <lwip/ip.h>
+#include <lwip/init.h>
+
+#if (LWIP_VERSION) >= 0x02000000U
+#include <lwip/prot/dhcp.h>
+#endif
 
 /* DHCP server option */
 
-- 
GitLab