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 5c6aa2797d4dcc04b3eda87dc6f4808be7e65fac..9baa731fe37045cf7ab7da0ff63150831a26bed9 100644 (file)
--- a/osfmk/mach/ndr.h
+++ b/osfmk/mach/ndr.h
@@ -34,6 +34,8 @@
 
 #include <stdint.h>
 #include <sys/cdefs.h>
+#include <libkern/OSByteOrder.h>
+
 
 typedef struct {
     unsigned char       mig_vers;
@@ -65,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__
@@ -97,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)