xnu-792.17.14.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_endian.h

diff --git a/bsd/hfs/hfs_endian.h b/bsd/hfs/hfs_endian.h
index 784299705682f206f69965d932750bbb4b049066..004e36c1235119bfbc67671740497902b100c988 100644 (file)
--- a/bsd/hfs/hfs_endian.h
+++ b/bsd/hfs/hfs_endian.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 #ifndef __HFS_ENDIAN_H__
 #define __HFS_ENDIAN_H__
@@ -34,16 +40,17 @@
  */
 #include "hfs.h"
 #include "hfscommon/headers/BTreesInternal.h"
-#include <libkern/OSByteOrder.h>
+#include <architecture/byte_order.h>
 
 /*********************/
 /* BIG ENDIAN Macros */
 /*********************/
-#define SWAP_BE16(__a)                                                         OSSwapBigToHostInt16 (__a)
-#define SWAP_BE32(__a)                                                         OSSwapBigToHostInt32 (__a)
-#define SWAP_BE64(__a)                                                         OSSwapBigToHostInt64 (__a)
-
 #if BYTE_ORDER == BIG_ENDIAN
+
+    /* HFS is always big endian, make swaps into no-ops */
+    #define SWAP_BE16(__a) (__a)
+    #define SWAP_BE32(__a) (__a)
+    #define SWAP_BE64(__a) (__a)
     
     /* HFS is always big endian, no swapping needed */
     #define SWAP_HFS_PLUS_FORK_DATA(__a)
@@ -53,6 +60,11 @@
 /************************/
 #elif BYTE_ORDER == LITTLE_ENDIAN
 
+    /* HFS is always big endian, make swaps actually swap */
+    #define SWAP_BE16(__a)                                                     NXSwapBigShortToHost (__a)
+    #define SWAP_BE32(__a)                                                     NXSwapBigLongToHost (__a)
+    #define SWAP_BE64(__a)                                                     NXSwapBigLongLongToHost (__a)
+    
     #define SWAP_HFS_PLUS_FORK_DATA(__a)                       hfs_swap_HFSPlusForkData ((__a))
 
 #else