xnu-1699.22.81.tar.gz

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

diff --git a/bsd/sys/ipc.h b/bsd/sys/ipc.h
index 13479cf6a3d542280a46564339e6134d4be9d202..a43cacc55a76d89a90d81a3e63052f1b89a845e1 100644 (file)
--- a/bsd/sys/ipc.h
+++ b/bsd/sys/ipc.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2002 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@
  */
 /*
  * Copyright (c) 1988 University of Utah.
@@ -99,18 +105,21 @@ typedef    __darwin_mode_t mode_t;
 typedef        __int32_t       key_t;
 #endif
 
+#pragma pack(4)
+
 /*
  * Technically, we should force all code references to the new structure
  * definition, not in just the standards conformance case, and leave the
  * legacy interface there for binary compatibility only.  Currently, we
  * are only forcing this for programs requesting standards conformance.
  */
-#if defined(__POSIX_C_SOURCE) || defined(kernel) || defined(__LP64__)
+#if __DARWIN_UNIX03 || defined(KERNEL)
 /*
  * [XSI] Information used in determining permission to perform an IPC
  * operation
  */
-struct __ipc_perm_new {
+struct ipc_perm
+{
        uid_t           uid;            /* [XSI] Owner's user ID */
        gid_t           gid;            /* [XSI] Owner's group ID */
        uid_t           cuid;           /* [XSI] Creator's user ID */
@@ -119,12 +128,12 @@ struct __ipc_perm_new {
        unsigned short  _seq;           /* Reserved for internal use */
        key_t           _key;           /* Reserved for internal use */
 };
-#define        ipc_perm        __ipc_perm_new
-#else  /* !_POSIX_C_SOURCE */
+#define        __ipc_perm_new  ipc_perm
+#else  /* !__DARWIN_UNIX03 */
 #define        ipc_perm        __ipc_perm_old
-#endif /* !_POSIX_C_SOURCE */
+#endif /* !__DARWIN_UNIX03 */
 
-#if !defined(__POSIX_C_SOURCE) && !defined(__LP64__)
+#if !__DARWIN_UNIX03
 /*
  * Legacy structure; this structure is maintained for binary backward
  * compatability with previous versions of the interface.  New code
@@ -139,7 +148,9 @@ struct __ipc_perm_old {
        __uint16_t      seq;            /* Reserved for internal use */
        key_t           key;            /* Reserved for internal use */
 };
-#endif /* !_POSIX_C_SOURCE */
+#endif /* !__DARWIN_UNIX03 */
+
+#pragma pack()
 
 /*
  * [XSI] Definitions shall be provided for the following constants:
@@ -159,14 +170,14 @@ struct __ipc_perm_old {
 #define        IPC_STAT        2               /* Get options */
 
 
-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 /* common mode bits */
 #define        IPC_R           000400          /* Read permission */
 #define        IPC_W           000200          /* Write/alter permission */
 #define        IPC_M           010000          /* Modify control info permission */
 
-#endif /* !_POSIX_C_SOURCE */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 
 
 #ifdef BSD_KERNEL_PRIVATE
@@ -178,7 +189,7 @@ struct __ipc_perm_old {
 /* Macros to convert between ipc ids and array indices or sequence ids */
 #define        IPCID_TO_IX(id)         ((id) & 0xffff)
 #define        IPCID_TO_SEQ(id)        (((id) >> 16) & 0xffff)
-#define        IXSEQ_TO_IPCID(ix,perm) (((perm.seq) << 16) | (ix & 0xffff))
+#define        IXSEQ_TO_IPCID(ix,perm) (((perm._seq) << 16L) | ((ix) & 0xffff))
 
 struct ucred;