aboutsummaryrefslogtreecommitdiffstats
path: root/com32/include/netinet/in.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-04-25 17:19:32 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-04-25 17:19:32 -0700
commit6bb618c959ffc6d462ce597f4e1f0e6c4baa7fa3 (patch)
treeeb738bf1a45e1fe0ee17fca8509c96a3579a6592 /com32/include/netinet/in.h
parent3b772bb6588a28fd5741ca86f579e3838d96eb80 (diff)
parent0c8bfd91ab11a00b796f32982a30414c8bac7ec9 (diff)
downloadsyslinux-6bb618c959ffc6d462ce597f4e1f0e6c4baa7fa3.tar.gz
syslinux-6bb618c959ffc6d462ce597f4e1f0e6c4baa7fa3.tar.xz
syslinux-6bb618c959ffc6d462ce597f4e1f0e6c4baa7fa3.zip
Merge remote-tracking branch 'origin/master' into lwip
Resolved Conflicts: com32/include/netinet/in.h Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/include/netinet/in.h')
-rw-r--r--com32/include/netinet/in.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/com32/include/netinet/in.h b/com32/include/netinet/in.h
index 70cdc932..b24f8046 100644
--- a/com32/include/netinet/in.h
+++ b/com32/include/netinet/in.h
@@ -3,8 +3,9 @@
/* COM32 will be running on an i386 platform */
-#include <stdint.h>
#include <klibc/compiler.h>
+#include <klibc/extern.h>
+#include <stdint.h>
#include <byteswap.h>
#define htons(x) bswap_16(x)
@@ -21,4 +22,6 @@ struct in_addr {
in_addr_t s_addr;
};
+__extern char *inet_ntoa(struct in_addr);
+
#endif /* _NETINET_IN_H */