Libinfo-324.tar.gz

[apple/libinfo.git] / util.subproj / hton.c

diff --git a/util.subproj/hton.c b/util.subproj/hton.c
index 312d514e82706ff728aaab2be660ba0d5b039efa..b40320fa5bfe01a4f222c8ef6139b4cc05e41cfd 100644 (file)
--- a/util.subproj/hton.c
+++ b/util.subproj/hton.c
@@ -1,52 +1,46 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2008 Apple Inc.  All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Portions Copyright (c) 1999 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 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. 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
+ * 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@
  */
-/* Copyright (c) 1994 NeXT Computer, Inc.  All rights reserved.
- *
- *      File:   hton.c
- *      Author: Matt Watson, NeXT Computer, Inc.
- *
- *      Use the machine independent byte-swapping code for htonl-type functions.
- *
- * HISTORY
- * 15-Dec-94  Matt Watson (Matt_Watson@NeXT.COM)
- *      Created.
- */
+/* Copyright (c) 1994 NeXT Computer, Inc.  All rights reserved. */
 
-#import <architecture/byte_order.h>
+#import <libkern/OSByteOrder.h>
+#import <stdint.h>
 
-long ntohl(long x) {
-    return NXSwapBigLongToHost(x);
+uint32_t ntohl(uint32_t x)
+{
+       return OSSwapBigToHostInt32(x);
 }
 
-short ntohs(short x) {
-    return NXSwapBigShortToHost(x);
+uint32_t htonl(uint32_t x)
+{
+       return OSSwapHostToBigInt32(x);
 }
 
-long htonl(long x) {
-    return NXSwapHostLongToBig(x);
+uint16_t ntohs(uint16_t x)
+{
+       return OSSwapBigToHostInt16(x);
 }
 
-short htons(short x) {
-    return NXSwapHostShortToBig(x);
+uint16_t htons(uint16_t x)
+{
+       return OSSwapHostToBigInt16(x);
 }