xnu-1699.22.73.tar.gz

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

diff --git a/bsd/sys/domain.h b/bsd/sys/domain.h
index 5c636904629ef9f078e76e13048f7d25b5d94134..9edf0db5ebaacff8db089e0e5972e61391737a2b 100644 (file)
--- a/bsd/sys/domain.h
+++ b/bsd/sys/domain.h
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
@@ -18,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@
  */
 /* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
@@ -79,13 +84,11 @@
 struct mbuf;
 #define DOM_REENTRANT  0x01
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=power
-#endif
+#pragma pack(4)
 
 struct domain {
        int     dom_family;             /* AF_xxx */
-       char    *dom_name;
+       const char      *dom_name;
        void    (*dom_init)(void);      /* initialize domain data structures */
        int     (*dom_externalize)(struct mbuf *);
                                        /* externalize access rights */
@@ -104,13 +107,11 @@ struct    domain {
 #else
        void    *dom_mtx;               /* domain global mutex */
 #endif
-       u_long          dom_flags;
-       u_long          reserved[2];
+       uint32_t                dom_flags;
+       uint32_t                reserved[2];
 };
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=reset
-#endif
+#pragma pack()
 
 #ifdef KERNEL
 extern struct  domain *domains;