summaryrefslogtreecommitdiff
path: root/com32/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-04-25 17:15:40 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-04-25 17:15:40 -0700
commit0c8bfd91ab11a00b796f32982a30414c8bac7ec9 (patch)
tree5142bd9cdf882aa2e6bbbbabafb0a3f6d6a54da1 /com32/include
parent842d7e35ccd8cd89105faf0266497e838d96c8b3 (diff)
downloadsyslinux-0c8bfd91ab11a00b796f32982a30414c8bac7ec9.tar.gz
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 <hpa@zytor.com>
Diffstat (limited to 'com32/include')
-rw-r--r--com32/include/netinet/in.h4
1 files changed, 3 insertions, 1 deletions
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 <stdint.h>
#include <klibc/compiler.h>
+#include <klibc/extern.h>
#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 */