From 0c8bfd91ab11a00b796f32982a30414c8bac7ec9 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 25 Apr 2011 17:15:40 -0700 Subject: com32: inet_ntoa() takes struct in_addr The standard definition for inet_ntoa() is to take struct in_addr, and not doing that causes a conflict on the lwip branch. Signed-off-by: H. Peter Anvin --- com32/include/netinet/in.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'com32/include') diff --git a/com32/include/netinet/in.h b/com32/include/netinet/in.h index eae11623..d2af351f 100644 --- a/com32/include/netinet/in.h +++ b/com32/include/netinet/in.h @@ -5,6 +5,7 @@ #include #include +#include #define __htons_macro(v) ((uint16_t) \ (((uint16_t)(v) << 8) | \ @@ -53,5 +54,6 @@ struct in_addr { in_addr_t s_addr; }; -char * inet_ntoa (in_addr_t addr); +__extern char *inet_ntoa(struct in_addr); + #endif /* _NETINET_IN_H */ -- cgit v1.2.1