[src/netbsd-2-0]: src/sys/arch/arm/include Pull up revision 1.6 (requested by...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/97e12cf5ce41
branches:  netbsd-2-0
changeset: 561367:97e12cf5ce41
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 14 17:58:29 2004 +0000

description:
Pull up revision 1.6 (requested by kleink in ticket #467):
Reflect <sys/endian.h> rev. 1.4: make htonl() et al. arguments and
results uint{16,32}_t.  Noted by Ian Zagorskih.

diffstat:

 sys/arch/arm/include/endian_machdep.h |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r 923f7b995444 -r 97e12cf5ce41 sys/arch/arm/include/endian_machdep.h
--- a/sys/arch/arm/include/endian_machdep.h     Mon Jun 14 17:58:23 2004 +0000
+++ b/sys/arch/arm/include/endian_machdep.h     Mon Jun 14 17:58:29 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: endian_machdep.h,v 1.5 2002/08/14 15:08:58 thorpej Exp $ */
+/* $NetBSD: endian_machdep.h,v 1.5.10.1 2004/06/14 17:58:29 tron Exp $ */
 
 /* GCC predefines __ARMEB__ when building for big-endian ARM. */
 #ifdef __ARMEB__
@@ -12,10 +12,10 @@
 #include <arm/byte_swap.h>
 
 #if _BYTE_ORDER == _LITTLE_ENDIAN
-#define        ntohl(x)        ((in_addr_t)__byte_swap_32((in_addr_t)(x)))
-#define        ntohs(x)        ((in_port_t)__byte_swap_16((in_port_t)(x)))
-#define        htonl(x)        ((in_addr_t)__byte_swap_32((in_addr_t)(x)))
-#define        htons(x)        ((in_port_t)__byte_swap_16((in_port_t)(x)))
+#define        ntohl(x)        ((uint32_t)__byte_swap_32((uint32_t)(x)))
+#define        ntohs(x)        ((uint16_t)__byte_swap_16((uint16_t)(x)))
+#define        htonl(x)        ((uint32_t)__byte_swap_32((uint32_t)(x)))
+#define        htons(x)        ((uint16_t)__byte_swap_16((uint16_t)(x)))
 #endif
 
 #endif