xnu-792.13.8.tar.gz

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

diff --git a/osfmk/i386/endian.h b/osfmk/i386/endian.h
index 0f802c36ad3a88c7edd017aad888a1bf3894f984..224546ced6ef8f52e90f5dab274251dd6fc2d0a0 100644 (file)
--- a/osfmk/i386/endian.h
+++ b/osfmk/i386/endian.h
@@ -1,26 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * 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
+ * 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.  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
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ *
+ * The 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
  * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -43,15 +48,11 @@
 
 /*
  * Macros for network/external number representation conversion.
- */
-
-unsigned short ntohs(unsigned short), htons(unsigned short);
-unsigned long  ntohl(unsigned long), htonl(unsigned long);
-
-/*
  * Use GNUC support to inline the byteswappers.
  */
 
+#if !defined(ntohs)
+unsigned short ntohs(unsigned short);
 extern __inline__
 unsigned short
 ntohs(unsigned short w_int)
@@ -60,9 +61,15 @@ ntohs(unsigned short w_int)
        __asm__ volatile("xchgb %h1,%b1" : "=q" (w) : "0" (w));
        return (w);     /* zero-extend for compat */
 }
+#endif
 
+#if !defined(htons)
+unsigned short htons(unsigned short);
 #define        htons   ntohs
+#endif
 
+#if !defined(ntohl)
+unsigned long  ntohl(unsigned long);
 extern __inline__
 unsigned long
 ntohl(register unsigned long value)
@@ -71,8 +78,12 @@ ntohl(register unsigned long value)
        __asm__ volatile("bswap %0" : "=r" (l) : "0" (l));
        return l;
 }
+#endif
 
+#if !defined(htonl)
+unsigned long  htonl(unsigned long);
 #define htonl  ntohl
+#endif
 
 #define NTOHL(x)       (x) = ntohl((unsigned long)x)
 #define NTOHS(x)       (x) = ntohs((unsigned short)x)