1 files changed, 7 insertions, 12 deletions

diff --git a/src/lib/libc/net/htonl.c b/src/lib/libc/net/htonl.c
index ac85cb0fd7..f104e190a2 100644
--- a/src/lib/libc/net/htonl.c
+++ b/src/lib/libc/net/htonl.c
@@ -1,29 +1,24 @@
-/*      $NetBSD: htonl.c,v 1.5 1995/04/28 23:25:14 jtc Exp $    */
-
 /*
  * Written by J.T. Conklin <jtc@netbsd.org>.
  * Public domain.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: htonl.c,v 1.5 1995/04/28 23:25:14 jtc Exp $";
-#endif
+static char *rcsid = "$OpenBSD: htonl.c,v 1.5 2005/03/25 13:24:12 otto Exp $";
+#endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <machine/endian.h>
 
 #undef htonl
 
-unsigned long
-htonl(x)
-        unsigned long x;
+u_int32_t
+htonl(u_int32_t x)
 {
-        u_int32_t y = x;
-
 #if BYTE_ORDER == LITTLE_ENDIAN
-        u_char *s = (u_char *)&y;
-        return s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3];
+        u_char *s = (u_char *)&x;
+        return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
 #else
-        return y;
+        return x;
 #endif
 }