mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-13 02:05:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflit, ipcp.c defines ip_ntoa() which is already defined by lwIP, disabled ipcp.c::ip_ntoa() and using lwIP one

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-02 17:04:46 +02:00
parent d3d1b69c7a
commit adb8b881b4
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/netif/ppp/ipcp.c
View File

@ -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.

2
src/netif/ppp/ipcp.h
View File

@ -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;

1
src/netif/ppp/pppmy.h
View File

@ -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"