short and long are now u_int16_t and u_int32_t

diff --git a/sys/lib/libkern/htonl.c b/sys/lib/libkern/htonl.c
index eba75f7..9ff932a 100644 (file)
--- a/sys/lib/libkern/htonl.c
+++ b/sys/lib/libkern/htonl.c
@@ -1,3 +1,4 @@
+/*     $OpenBSD: htonl.c,v 1.3 1996/11/27 19:51:39 niklas Exp $        */
 /*     $NetBSD: htonl.c,v 1.6.6.1 1996/05/29 23:47:55 cgd Exp $        */
 
 /*
@@ -14,9 +15,9 @@ static char *rcsid = "$NetBSD: htonl.c,v 1.6.6.1 1996/05/29 23:47:55 cgd Exp $";
 
 #undef htonl
 
-unsigned long
+u_int32_t
 htonl(x)
-       unsigned long x;
+       u_int32_t x;
 {
        u_int32_t y = x;
 

diff --git a/sys/lib/libkern/htons.c b/sys/lib/libkern/htons.c
index 0b60f63..0928801 100644 (file)
--- a/sys/lib/libkern/htons.c
+++ b/sys/lib/libkern/htons.c
@@ -1,3 +1,4 @@
+/*     $OpenBSD: htons.c,v 1.3 1996/11/27 19:51:40 niklas Exp $        */
 /*     $NetBSD: htons.c,v 1.6.6.1 1996/05/29 23:48:02 cgd Exp $        */
 
 /*
@@ -14,9 +15,9 @@ static char *rcsid = "$NetBSD: htons.c,v 1.6.6.1 1996/05/29 23:48:02 cgd Exp $";
 
 #undef htons
 
-unsigned short
+u_int16_t
 htons(x)
-       unsigned short x;
+       u_int16_t x;
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
        u_char *s = (u_char *) &x;

diff --git a/sys/lib/libkern/ntohl.c b/sys/lib/libkern/ntohl.c
index 167ee5f..5d5d97e 100644 (file)
--- a/sys/lib/libkern/ntohl.c
+++ b/sys/lib/libkern/ntohl.c
@@ -1,3 +1,4 @@
+/*     $OpenBSD: ntohl.c,v 1.3 1996/11/27 19:51:41 niklas Exp $        */
 /*     $NetBSD: ntohl.c,v 1.6.6.1 1996/05/29 23:48:07 cgd Exp $        */
 
 /*
@@ -14,9 +15,9 @@ static char *rcsid = "$NetBSD: ntohl.c,v 1.6.6.1 1996/05/29 23:48:07 cgd Exp $";
 
 #undef ntohl
 
-unsigned long
+u_int32_t
 ntohl(x)
-       unsigned long x;
+       u_int32_t x;
 {
        u_int32_t y = x;
 

diff --git a/sys/lib/libkern/ntohs.c b/sys/lib/libkern/ntohs.c
index 33a8cf6..a5f870b 100644 (file)
--- a/sys/lib/libkern/ntohs.c
+++ b/sys/lib/libkern/ntohs.c
@@ -1,3 +1,4 @@
+/*     $OpenBSD: ntohs.c,v 1.3 1996/11/27 19:51:42 niklas Exp $        */
 /*     $NetBSD: ntohs.c,v 1.5.6.1 1996/05/29 23:48:11 cgd Exp $        */
 
 /*
@@ -14,9 +15,9 @@ static char *rcsid = "$NetBSD: ntohs.c,v 1.5.6.1 1996/05/29 23:48:11 cgd Exp $";
 
 #undef ntohs
 
-unsigned short
+u_int16_t
 ntohs(x)
-       unsigned short x;
+       u_int16_t x;
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
        u_char *s = (u_char *) &x;