xnu-4570.1.46.tar.gz

[apple/xnu.git] / bsd / i386 / endian.h

diff --git a/bsd/i386/endian.h b/bsd/i386/endian.h
index f512aa16988052c344ced41b3e6757b5a159a3f0..9f64aa0c84b8034406c22285a2072a5d0bd70100 100644 (file)
--- a/bsd/i386/endian.h
+++ b/bsd/i386/endian.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright 1995 NeXT Computer, Inc. All rights reserved.
@@ -63,6 +66,7 @@
 #ifndef _I386__ENDIAN_H_
 #define        _I386__ENDIAN_H_
 
+#include <sys/cdefs.h>
 /*
  * Define _NOQUAD if the compiler does NOT support 64-bit integers.
  */
@@ -74,52 +78,25 @@
 #define _QUAD_HIGHWORD 1
 #define _QUAD_LOWWORD 0
 
-#if    defined(KERNEL) || !defined(_POSIX_SOURCE)
 /*
  * Definitions for byte order, according to byte significance from low
  * address to high.
  */
-#define        LITTLE_ENDIAN   1234    /* LSB first: i386, vax */
-#define        BIG_ENDIAN      4321    /* MSB first: 68000, ibm, net */
-#define        PDP_ENDIAN      3412    /* LSB first in word, MSW first in long */
+#define        __DARWIN_LITTLE_ENDIAN  1234    /* LSB first: i386, vax */
+#define        __DARWIN_BIG_ENDIAN     4321    /* MSB first: 68000, ibm, net */
+#define        __DARWIN_PDP_ENDIAN     3412    /* LSB first in word, MSW first in long */
 
-#define        BYTE_ORDER      LITTLE_ENDIAN
+#define        __DARWIN_BYTE_ORDER     __DARWIN_LITTLE_ENDIAN
 
-#include <sys/cdefs.h>
+#if    defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 
-__BEGIN_DECLS
-unsigned long  htonl __P((unsigned long));
-unsigned short htons __P((unsigned short));
-unsigned long  ntohl __P((unsigned long));
-unsigned short ntohs __P((unsigned short));
-__END_DECLS
-
-/*
- * Macros for network/external number representation conversion.
- */
-#if BYTE_ORDER == BIG_ENDIAN && !defined(lint)
-#define        ntohl(x)        (x)
-#define        ntohs(x)        (x)
-#define        htonl(x)        (x)
-#define        htons(x)        (x)
+#define        LITTLE_ENDIAN   __DARWIN_LITTLE_ENDIAN
+#define        BIG_ENDIAN      __DARWIN_BIG_ENDIAN
+#define        PDP_ENDIAN      __DARWIN_PDP_ENDIAN
 
-#define        NTOHL(x)        (x)
-#define        NTOHS(x)        (x)
-#define        HTONL(x)        (x)
-#define        HTONS(x)        (x)
+#define        BYTE_ORDER      __DARWIN_BYTE_ORDER
 
-#else
-#include <machine/byte_order.h>
- 
-#define ntohl(x)       NXSwapBigLongToHost(x)
-#define ntohs(x)       NXSwapBigShortToHost(x)
-#define htonl(x)       NXSwapHostLongToBig(x)
-#define htons(x)       NXSwapHostShortToBig(x)
+#include <sys/_endian.h>
 
-#define        NTOHL(x)        (x) = ntohl((u_long)x)
-#define        NTOHS(x)        (x) = ntohs((u_short)x)
-#define        HTONL(x)        (x) = htonl((u_long)x)
-#define        HTONS(x)        (x) = htons((u_short)x)
-#endif
-#endif /* defined(KERNEL) || !defined(_POSIX_SOURCE) */
+#endif /* defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) */
 #endif /* !_I386__ENDIAN_H_ */