xnu-3247.1.106.tar.gz

[apple/xnu.git] / bsd / sys / ipcs.h

diff --git a/bsd/sys/ipcs.h b/bsd/sys/ipcs.h
index e4a6e23f4d5b6b4798a3f1bd4bed32d0c6bc5c3f..48215be74044b1f5cce83bacc7211f25a831d17c 100644 (file)
--- a/bsd/sys/ipcs.h
+++ b/bsd/sys/ipcs.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 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@
  */
 /*
  * NOTE: Internal ipcs.h header; all interfaces are private; if you want this
@@ -53,10 +59,6 @@ struct IPCS_command {
 #ifdef KERNEL_PRIVATE
 #include <machine/types.h>
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-
 struct user_IPCS_command {
        int             ipcs_magic;     /* Magic number for struct layout */
        int             ipcs_op;        /* Operation to perform */
@@ -65,9 +67,13 @@ struct user_IPCS_command {
        user_addr_t     ipcs_data;      /* OP specific data */
 };
 
-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
+struct user32_IPCS_command {
+       int             ipcs_magic;     /* Magic number for struct layout */
+       int             ipcs_op;        /* Operation to perform */
+       int             ipcs_cursor;    /* Cursor for iteration functions */
+       int             ipcs_datalen;   /* Length of ipcs_data area */
+       user32_addr_t   ipcs_data;      /* OP specific data */
+};
 
 #endif /* KERNEL_PRIVATE */