xnu-2050.24.15.tar.gz

[apple/xnu.git] / bsd / net / raw_cb.h

diff --git a/bsd/net/raw_cb.h b/bsd/net/raw_cb.h
index d047ae38f7dca6ebdea4e5e036c5950ae68bb357..90655ca98052aa309c1503e9a7fe848c321fa059 100644 (file)
--- a/bsd/net/raw_cb.h
+++ b/bsd/net/raw_cb.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 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) 1980, 1986, 1993
@@ -60,7 +66,7 @@
 
 #include <sys/queue.h>
 
-#ifdef __APPLE_API_PRIVATE
+#ifdef PRIVATE
 /*
  * Raw protocol interface control block.  Used
  * to tie a socket to the generic raw interface.
@@ -71,9 +77,8 @@ struct rawcb {
        struct  sockaddr *rcb_faddr;    /* destination address */
        struct  sockaddr *rcb_laddr;    /* socket's address */
        struct  sockproto rcb_proto;    /* protocol family, protocol */
-       u_long  reserved[4];            /* for future use */
+       uint32_t        reserved[4];            /* for future use */
 };
-#endif /* __APPLE_API_PRIVATE */
 
 #define        sotorawcb(so)           ((struct rawcb *)(so)->so_pcb)
 
@@ -82,21 +87,20 @@ struct rawcb {
  */
 #define        RAWSNDQ         8192
 #define        RAWRCVQ         8192
+#endif /* PRIVATE */
 
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef KERNEL_PRIVATE
 extern LIST_HEAD(rawcb_list_head, rawcb) rawcb_list;
 
-int     raw_attach __P((struct socket *, int));
-void    raw_ctlinput __P((int, struct sockaddr *, void *));
-void    raw_detach __P((struct rawcb *));
-void    raw_disconnect __P((struct rawcb *));
-void    raw_init __P((void));
-void    raw_input __P((struct mbuf *,
-           struct sockproto *, struct sockaddr *, struct sockaddr *));
+int     raw_attach(struct socket *, int);
+void    raw_ctlinput(int, struct sockaddr *, void *);
+void    raw_detach(struct rawcb *);
+void    raw_disconnect(struct rawcb *);
+void    raw_init(void);
+void    raw_input(struct mbuf *,
+           struct sockproto *, struct sockaddr *, struct sockaddr *);
 
 extern struct pr_usrreqs raw_usrreqs;
-#endif /* __APPLE_API_PRIVATE */
-#endif
+#endif /* KERNEL_PRIVATE */
 
 #endif