From adb8b881b4c8d8ea80468a085e5521b16d482728 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Sat, 2 Jun 2012 17:04:46 +0200
Subject: [PATCH] resolve conflit, ipcp.c defines ip_ntoa() which is already
 defined by lwIP, disabled ipcp.c::ip_ntoa() and using lwIP one

---
 src/netif/ppp/ipcp.c  | 3 +++
 src/netif/ppp/ipcp.h  | 2 ++
 src/netif/ppp/pppmy.h | 1 +
 3 files changed, 6 insertions(+)

diff --git a/src/netif/ppp/ipcp.c b/src/netif/ppp/ipcp.c
index a9c4755a..eaffe6f1 100644
--- a/src/netif/ppp/ipcp.c
+++ b/src/netif/ppp/ipcp.c
@@ -58,6 +58,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include "pppmy.h"
 #include "pppd.h"
 #include "fsm.h"
 #include "ipcp.h"
@@ -312,6 +313,7 @@ static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool));
 #define CODENAME(x)	((x) == CONFACK ? "ACK" : \
 			 (x) == CONFNAK ? "NAK" : "REJ")
 
+#if 0 /* UNUSED, already defined by lwIP */
 /*
  * Make a string representation of a network IP address.
  */
@@ -324,6 +326,7 @@ u_int32_t ipaddr;
     slprintf(b, sizeof(b), "%I", ipaddr);
     return b;
 }
+#endif /* UNUSED, already defined by lwIP */
 
 /*
  * Option parsing.
diff --git a/src/netif/ppp/ipcp.h b/src/netif/ppp/ipcp.h
index 7ecfa79d..332575e7 100644
--- a/src/netif/ppp/ipcp.h
+++ b/src/netif/ppp/ipcp.h
@@ -92,6 +92,8 @@ extern ipcp_options ipcp_gotoptions[];
 extern ipcp_options ipcp_allowoptions[];
 extern ipcp_options ipcp_hisoptions[];
 
+#if 0 /* UNUSED, already defined by lwIP */
 char *ip_ntoa __P((u_int32_t));
+#endif /* UNUSED, already defined by lwIP */
 
 extern struct protent ipcp_protent;
diff --git a/src/netif/ppp/pppmy.h b/src/netif/ppp/pppmy.h
index 2579c550..d88c6e45 100644
--- a/src/netif/ppp/pppmy.h
+++ b/src/netif/ppp/pppmy.h
@@ -12,6 +12,7 @@
 
 #include <syslog.h> /* FIXME: temporary */
 
+#include <net/ppp_defs.h> /* FIXME: merge linux/ppp_defs.h content here */
 
 #include "lwip/netif.h"
 #include "lwip/def.h"