xnu-344.49.tar.gz

[apple/xnu.git] / bsd / netinet / ip_encap.h

diff --git a/bsd/netinet/ip_encap.h b/bsd/netinet/ip_encap.h
index c795d55c0d4dce3780a6552a67f68aed6b97ae79..81c8b7ce0624e2e9243e504844c36a5ce2ce1201 100644 (file)
--- a/bsd/netinet/ip_encap.h
+++ b/bsd/netinet/ip_encap.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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@
  */
@@ -52,8 +55,10 @@
 
 #ifndef _NETINET_IP_ENCAP_H_
 #define _NETINET_IP_ENCAP_H_
+#include <sys/appleapiopts.h>
 
-#if KERNEL
+#ifdef KERNEL
+#ifdef __APPLE_API_PRIVATE
 
 struct encaptab {
        LIST_ENTRY(encaptab) chain;
@@ -69,8 +74,8 @@ struct encaptab {
 };
 
 void   encap_init __P((void));
-void   encap4_input __P((struct mbuf *, int, int));
-int    encap6_input __P((struct mbuf **, int *, int));
+void   encap4_input __P((struct mbuf *, int));
+int    encap6_input __P((struct mbuf **, int *));
 const struct encaptab *encap_attach __P((int, int, const struct sockaddr *,
        const struct sockaddr *, const struct sockaddr *,
        const struct sockaddr *, const struct protosw *, void *));
@@ -79,6 +84,7 @@ const struct encaptab *encap_attach_func __P((int, int,
        const struct protosw *, void *));
 int    encap_detach __P((const struct encaptab *));
 void   *encap_getarg __P((struct mbuf *));
+#endif /* __APPLE_API_PRIVATE */
 #endif
 
 #endif /*_NETINET_IP_ENCAP_H_*/