summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-08-19 08:59:24 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-08-19 08:59:24 +0000
commit3e87e80031b19a18df69be9169f759bb3fb3c21d (patch)
tree0e9806c0c1482e7cc3a691630f3b2fa2d8c6e160
parent9924c949b21514005b1c12dd0262fe2db6574207 (diff)
downloaddrakx-3e87e80031b19a18df69be9169f759bb3fb3c21d.tar
drakx-3e87e80031b19a18df69be9169f759bb3fb3c21d.tar.gz
drakx-3e87e80031b19a18df69be9169f759bb3fb3c21d.tar.bz2
drakx-3e87e80031b19a18df69be9169f759bb3fb3c21d.tar.xz
drakx-3e87e80031b19a18df69be9169f759bb3fb3c21d.zip
Fix htonl() on 64-bit platforms
-rw-r--r--mdk-stage1/dietlibc/include/netinet/in.h8
-rw-r--r--mdk-stage1/dietlibc/lib/htonl.c4
-rw-r--r--mdk-stage1/dietlibc/lib/htons.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/mdk-stage1/dietlibc/include/netinet/in.h b/mdk-stage1/dietlibc/include/netinet/in.h
index 0b5278759..9f98cc050 100644
--- a/mdk-stage1/dietlibc/include/netinet/in.h
+++ b/mdk-stage1/dietlibc/include/netinet/in.h
@@ -354,10 +354,10 @@ struct ipv6hdr {
#undef htons
#undef ntohl
#undef ntohs
-unsigned long int htonl(unsigned long int hostlong);
-unsigned short int htons(unsigned short int hostshort);
-unsigned long int ntohl(unsigned long int netlong);
-unsigned short int ntohs(unsigned short int netshort);
+uint32_t htonl(uint32_t hostlong);
+uint16_t htons(uint16_t hostshort);
+uint32_t ntohl(uint32_t netlong);
+uint16_t ntohs(uint16_t netshort);
#define IN6_IS_ADDR_UNSPECIFIED(a) \
(((__const uint32_t *) (a))[0] == 0 \
diff --git a/mdk-stage1/dietlibc/lib/htonl.c b/mdk-stage1/dietlibc/lib/htonl.c
index 04a1e4265..4096d04f5 100644
--- a/mdk-stage1/dietlibc/lib/htonl.c
+++ b/mdk-stage1/dietlibc/lib/htonl.c
@@ -1,7 +1,7 @@
#include <endian.h>
#include <netinet/in.h>
-unsigned long int htonl(unsigned long int hostlong) {
+uint32_t htonl(uint32_t hostlong) {
#if __BYTE_ORDER==__LITTLE_ENDIAN
return (hostlong>>24) | ((hostlong&0xff0000)>>8) |
((hostlong&0xff00)<<8) | (hostlong<<24);
@@ -10,4 +10,4 @@ unsigned long int htonl(unsigned long int hostlong) {
#endif
}
-unsigned long int ntohl(unsigned long int hostlong) __attribute__((weak,alias("htonl")));
+uint32_t ntohl(uint32_t hostlong) __attribute__((weak,alias("htonl")));
diff --git a/mdk-stage1/dietlibc/lib/htons.c b/mdk-stage1/dietlibc/lib/htons.c
index 071001911..a64483174 100644
--- a/mdk-stage1/dietlibc/lib/htons.c
+++ b/mdk-stage1/dietlibc/lib/htons.c
@@ -1,7 +1,7 @@
#include <endian.h>
#include <netinet/in.h>
-unsigned short int htons(unsigned short int hostshort) {
+uint16_t htons(uint16_t hostshort) {
#if __BYTE_ORDER==__LITTLE_ENDIAN
return ((hostshort>>8)&0xff) | (hostshort<<8);
#else
@@ -9,4 +9,4 @@ unsigned short int htons(unsigned short int hostshort) {
#endif
}
-unsigned short int ntohs(unsigned short int hostshort) __attribute__((weak,alias("htons")));
+uint16_t ntohs(uint16_t hostshort) __attribute__((weak,alias("htons")));