xnu-4570.71.2.tar.gz

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

diff --git a/osfmk/mach/mig.h b/osfmk/mach/mig.h
index c0e114ca46e7cd90b17d52984f3f1773fd03f139..44a208dd6d920cc2896244e9bbe4b18ff3c8c6c6 100644 (file)
--- a/osfmk/mach/mig.h
+++ b/osfmk/mach/mig.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -45,26 +45,32 @@
 
 #if defined(MACH_KERNEL)
 
 
 #if defined(MACH_KERNEL)
 

+#if !defined(__MigTypeCheck)

 /* Turn MIG type checking on by default for kernel */
 #define __MigTypeCheck 1
 /* Turn MIG type checking on by default for kernel */
 #define __MigTypeCheck 1

+#endif
+

 #define __MigKernelSpecificCode 1
 #define _MIG_KERNEL_SPECIFIC_CODE_ 1
 
 #define __MigKernelSpecificCode 1
 #define _MIG_KERNEL_SPECIFIC_CODE_ 1
 

-/* Otherwise check legacy setting (temporary) */
-#elif defined(TypeCheck)  
+#elif !defined(__MigTypeCheck)

 
 

+#if defined(TypeCheck)
+/* use legacy setting (temporary) */

 #define __MigTypeCheck TypeCheck
 #define __MigTypeCheck TypeCheck

- 
-#endif /* defined(TypeCheck) */
+#else
+/* default MIG type checking on */
+#define __MigTypeCheck 1
+#endif
+
+#endif /* !defined(MACH_KERNEL) && !defined(__MigTypeCheck) */

 
 /*
 
 /*

- * Pack MIG message structs if we have Power alignment of structs.
+ * Pack MIG message structs.

  * This is an indicator of the need to view shared structs in a
  * binary-compatible format - and MIG message structs are no different.
  */
  * This is an indicator of the need to view shared structs in a
  * binary-compatible format - and MIG message structs are no different.
  */

-#if __DARWIN_ALIGN_POWER

 #define __MigPackStructs 1
 #define __MigPackStructs 1

-#endif

 
 /*
  * Definition for MIG-generated server stub routines.  These routines
 
 /*
  * Definition for MIG-generated server stub routines.  These routines


@@ -267,11 +273,12 @@ extern void mig_put_reply_port(mach_port_t reply_port);
 
 /* Bounded string copy */
 extern int mig_strncpy(char    *dest, const char *src, int     len);
 
 /* Bounded string copy */
 extern int mig_strncpy(char    *dest, const char *src, int     len);

+extern int mig_strncpy_zerofill(char   *dest, const char *src, int     len);

 
 #ifdef KERNEL_PRIVATE
 
 /* Allocate memory for out-of-stack mig structures */
 
 #ifdef KERNEL_PRIVATE
 
 /* Allocate memory for out-of-stack mig structures */

-extern char *mig_user_allocate(vm_size_t size);
+extern void *mig_user_allocate(vm_size_t size);

 
 /* Deallocate memory used for out-of-stack mig structures */
 extern void mig_user_deallocate(char *data, vm_size_t size);
 
 /* Deallocate memory used for out-of-stack mig structures */
 extern void mig_user_deallocate(char *data, vm_size_t size);