xnu-4570.41.2.tar.gz

[apple/xnu.git] / osfmk / mach / ndr.h

diff --git a/osfmk/mach/ndr.h b/osfmk/mach/ndr.h
index 9b3d180372ebc772d946db46630a7fadf6f49673..9baa731fe37045cf7ab7da0ff63150831a26bed9 100644 (file)
--- a/osfmk/mach/ndr.h
+++ b/osfmk/mach/ndr.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2005 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@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -28,6 +34,8 @@
 
 #include <stdint.h>
 #include <sys/cdefs.h>
+#include <libkern/OSByteOrder.h>
+
 
 typedef struct {
     unsigned char       mig_vers;
@@ -59,12 +67,14 @@ typedef struct {
 
 extern NDR_record_t NDR_record;
 
-#ifndef __NDR_convert__
-#define __NDR_convert__ 1
-#endif /* __NDR_convert__ */
+/* NDR conversion off by default */
+
+#if !defined(__NDR_convert__)
+#define __NDR_convert__ 0
+#endif /* !defined(__NDR_convert__) */
 
 #ifndef __NDR_convert__int_rep__
-#define __NDR_convert__int_rep__ 1
+#define __NDR_convert__int_rep__ __NDR_convert__
 #endif /* __NDR_convert__int_rep__ */
 
 #ifndef __NDR_convert__char_rep__
@@ -91,8 +101,6 @@ extern NDR_record_t NDR_record;
 
 #if __NDR_convert__int_rep__
 
-#include <libkern/OSByteOrder.h>
-
 #define __NDR_READSWAP_assign(a, rs)   do { *(a) = rs(a); } while (0)
 
 #define __NDR_READSWAP__uint16_t(a)    OSReadSwapInt16((void *)a, 0)