xnu-2050.22.13.tar.gz

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

diff --git a/bsd/sys/domain.h b/bsd/sys/domain.h
index eea934b6f98b9965ced8dd82f066416a89306613..9f6bd965fd4ff41da3c413911077896abd0ab5f2 100644 (file)
--- a/bsd/sys/domain.h
+++ b/bsd/sys/domain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006, 2012 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -84,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 */
@@ -109,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;
@@ -124,6 +120,8 @@ extern struct       domain localdomain;
 __BEGIN_DECLS
 extern void    net_add_domain(struct domain *dp);
 extern int     net_del_domain(struct domain *);
+extern int     domain_proto_mtx_lock(void);
+extern void    domain_proto_mtx_unlock(int locked);
 __END_DECLS
 
 #define DOMAIN_SET(domain_set)