xnu-792.6.61.tar.gz

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

diff --git a/bsd/ppc/endian.h b/bsd/ppc/endian.h
index ea3b815f58d60128388163b19d043c47d549daa2..72808459e8416af0cfe140df5bd475602c45203c 100644 (file)
--- a/bsd/ppc/endian.h
+++ b/bsd/ppc/endian.h
@@ -1,6 +1,28 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
 /*
  * Copyright (c) 1995 NeXT Computer, Inc. All rights reserved.
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -64,55 +86,25 @@
 #define _QUAD_HIGHWORD 0
 #define _QUAD_LOWWORD 1
 
-#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, ppc */
-#define        PDP_ENDIAN      3412    /* LSB first in word, MSW first in long */
-
-#define        BYTE_ORDER      BIG_ENDIAN
+#define        __DARWIN_LITTLE_ENDIAN  1234    /* LSB first: i386, vax */
+#define        __DARWIN_BIG_ENDIAN     4321    /* MSB first: 68000, ibm, net, ppc */
+#define        __DARWIN_PDP_ENDIAN     3412    /* LSB first in word, MSW first in long */
 
-#include <sys/cdefs.h>
+#define        __DARWIN_BYTE_ORDER     __DARWIN_BIG_ENDIAN
 
-#ifndef __ASSEMBLER__
-__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
-#endif /* __ASSEMBLER__ */
-
-/*
- * 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)
+#if    defined(KERNEL) || !defined(_POSIX_C_SOURCE)
 
-#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
 
-#else
+#define        BYTE_ORDER      __DARWIN_BYTE_ORDER
 
-#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) */
 #endif /* !_PPC_ENDIAN_H_ */