make 64 bit clean

4 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libc/net/htonl.c b/src/lib/libc/net/htonl.c
index ac85cb0fd7..d0a22e1f30 100644
--- a/src/lib/libc/net/htonl.c
+++ b/src/lib/libc/net/htonl.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: htonl.c,v 1.5 1995/04/28 23:25:14 jtc Exp $    */
+/*      $NetBSD: htonl.c,v 1.5.6.1 1996/05/29 23:28:06 cgd Exp $        */
 
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
@@ -6,7 +6,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: htonl.c,v 1.5 1995/04/28 23:25:14 jtc Exp $";
+static char *rcsid = "$NetBSD: htonl.c,v 1.5.6.1 1996/05/29 23:28:06 cgd Exp $";
 #endif
 
 #include <sys/types.h>
@@ -22,7 +22,7 @@ htonl(x)
 
 #if BYTE_ORDER == LITTLE_ENDIAN
         u_char *s = (u_char *)&y;
-        return s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3];
+        return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
 #else
         return y;
 #endif
diff --git a/src/lib/libc/net/htons.c b/src/lib/libc/net/htons.c
index 9b1de6ccfc..0ecb62b95c 100644
--- a/src/lib/libc/net/htons.c
+++ b/src/lib/libc/net/htons.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: htons.c,v 1.5 1995/04/28 23:25:19 jtc Exp $    */
+/*      $NetBSD: htons.c,v 1.5.6.1 1996/05/29 23:28:19 cgd Exp $        */
 
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
@@ -6,7 +6,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: htons.c,v 1.5 1995/04/28 23:25:19 jtc Exp $";
+static char *rcsid = "$NetBSD: htons.c,v 1.5.6.1 1996/05/29 23:28:19 cgd Exp $";
 #endif
 
 #include <sys/types.h>
@@ -24,7 +24,7 @@ htons(x)
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
         u_char *s = (u_char *) &x;
-        return s[0] << 8 | s[1];
+        return (u_int16_t)(s[0] << 8 | s[1]);
 #else
         return x;
 #endif
diff --git a/src/lib/libc/net/ntohl.c b/src/lib/libc/net/ntohl.c
index 05b7f4c9a3..5df37075ac 100644
--- a/src/lib/libc/net/ntohl.c
+++ b/src/lib/libc/net/ntohl.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: ntohl.c,v 1.5 1995/04/28 23:25:21 jtc Exp $    */
+/*      $NetBSD: ntohl.c,v 1.5.6.1 1996/05/29 23:28:26 cgd Exp $        */
 
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
@@ -6,7 +6,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: ntohl.c,v 1.5 1995/04/28 23:25:21 jtc Exp $";
+static char *rcsid = "$NetBSD: ntohl.c,v 1.5.6.1 1996/05/29 23:28:26 cgd Exp $";
 #endif
 
 #include <sys/types.h>
@@ -22,7 +22,7 @@ ntohl(x)
 
 #if BYTE_ORDER == LITTLE_ENDIAN
         u_char *s = (u_char *)&y;
-        return s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3];
+        return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
 #else
         return y;
 #endif
diff --git a/src/lib/libc/net/ntohs.c b/src/lib/libc/net/ntohs.c
index 6e180c16ab..a665db9f39 100644
--- a/src/lib/libc/net/ntohs.c
+++ b/src/lib/libc/net/ntohs.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: ntohs.c,v 1.5 1995/04/28 23:25:23 jtc Exp $    */
+/*      $NetBSD: ntohs.c,v 1.5.6.1 1996/05/29 23:28:33 cgd Exp $        */
 
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
@@ -6,7 +6,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: ntohs.c,v 1.5 1995/04/28 23:25:23 jtc Exp $";
+static char *rcsid = "$NetBSD: ntohs.c,v 1.5.6.1 1996/05/29 23:28:33 cgd Exp $";
 #endif
 
 #include <sys/types.h>
@@ -24,7 +24,7 @@ ntohs(x)
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
         u_char *s = (u_char *) &x;
-        return s[0] << 8 | s[1];
+        return (u_int16_t)(s[0] << 8 | s[1]);
 #else
         return x;
 #endif