xnu-1228.9.59.tar.gz

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

diff --git a/bsd/sys/protosw.h b/bsd/sys/protosw.h
index ebf1e5163aa32043928d87a0712e9a5b606c3bfa..aaa56fe749cc5b5ca5348d53c6153cd42fbf3884 100644 (file)
--- a/bsd/sys/protosw.h
+++ b/bsd/sys/protosw.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 */
@@ -107,9 +112,7 @@ struct socket_filter;
 #include <kern/locks.h>
 #endif /* KERNEL */
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=power
-#endif
+#pragma pack(4)
 
 struct protosw {
        short   pr_type;                /* socket type used for */
@@ -157,9 +160,7 @@ struct protosw {
 #endif
 };
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=reset
-#endif
+#pragma pack()
 
 /*
  * Values for pr_flags.
@@ -268,7 +269,7 @@ struct pr_usrreqs {
 #define        PRUS_OOB        0x1
 #define        PRUS_EOF        0x2
 #define        PRUS_MORETOCOME 0x4
-       int     (*pru_sense)(struct socket *so, struct stat *sb);
+       int     (*pru_sense)(struct socket *so, void  *sb, int isstat64);
        int     (*pru_shutdown)(struct socket *so);
        int     (*pru_sockaddr)(struct socket *so, struct sockaddr **nam);
         
@@ -315,7 +316,7 @@ extern int  pru_rcvoob_notsupp(struct socket *so, struct mbuf *m,
 extern int     pru_send_notsupp(struct socket *so, int flags, struct mbuf *m, 
                                 struct sockaddr *addr, struct mbuf *control,
                                 struct proc *p);
-extern int     pru_sense_null(struct socket *so, struct stat *sb);
+extern int     pru_sense_null(struct socket *so, void * sb, int isstat64);
 extern int     pru_shutdown_notsupp(struct socket *so);
 extern int     pru_sockaddr_notsupp(struct socket *so, 
                                     struct sockaddr **nam);
@@ -405,6 +406,7 @@ char        *prcorequests[] = {
 #ifdef KERNEL
 
 __BEGIN_DECLS
+void   domaininit(void);
 
 void   pfctlinput(int, struct sockaddr *);
 void   pfctlinput2(int, struct sockaddr *, void *);