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 64ce2a60afd06f282e20aceef9d8c321c09cfd26..9baa731fe37045cf7ab7da0ff63150831a26bed9 100644 (file)
--- a/osfmk/mach/ndr.h
+++ b/osfmk/mach/ndr.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * 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
@@ -20,7 +23,7 @@
  * 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@
@@ -30,6 +33,9 @@
 #define _MACH_NDR_H_
 
 #include <stdint.h>
+#include <sys/cdefs.h>
+#include <libkern/OSByteOrder.h>
+
 
 typedef struct {
     unsigned char       mig_vers;
@@ -61,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__
@@ -93,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)
@@ -104,6 +110,8 @@ extern NDR_record_t NDR_record;
 #define __NDR_READSWAP__uint64_t(a)    OSReadSwapInt64((void *)a, 0)
 #define __NDR_READSWAP__int64_t(a)     (int64_t)OSReadSwapInt64((void *)a, 0)
 
+__BEGIN_DECLS
+
 static __inline__ float __NDR_READSWAP__float(float *argp) {
        union {
                float sv;
@@ -122,6 +130,8 @@ static __inline__ double __NDR_READSWAP__double(double *argp) {
        return result.sv;
 }
 
+__END_DECLS
+
 #define __NDR_convert__int_rep__int16_t__defined
 #define __NDR_convert__int_rep__int16_t(v,f)           \
        __NDR_READSWAP_assign(v, __NDR_READSWAP__int16_t)