xnu-792.6.76.tar.gz

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

diff --git a/bsd/netinet/icmp_var.h b/bsd/netinet/icmp_var.h
index bd03dd9af6b2e1583571cb33d9acc26f365d90b8..ec3a8ef5c40b9757c55d73cd0c76e9b08b427aeb 100644 (file)
--- a/bsd/netinet/icmp_var.h
+++ b/bsd/netinet/icmp_var.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -61,7 +58,6 @@
 #ifndef _NETINET_ICMP_VAR_H_
 #define _NETINET_ICMP_VAR_H_
 #include <sys/appleapiopts.h>
-#ifdef __APPLE_API_UNSTABLE
 
 /*
  * Variables related to this implementation
@@ -93,6 +89,7 @@ struct        icmpstat {
 #define ICMPCTL_TIMESTAMP      4       /* allow replies to time stamp requests */
 #define ICMPCTL_MAXID          5
 
+#ifdef KERNEL_PRIVATE
 #define ICMPCTL_NAMES { \
        { 0, 0 }, \
        { "maskrepl", CTLTYPE_INT }, \
@@ -100,13 +97,10 @@ struct     icmpstat {
        { "icmplim", CTLTYPE_INT }, \
        { "icmptimestamp", CTLTYPE_INT }, \
 }
-#endif /* __APPLE_API_UNSTABLE */
 
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
 SYSCTL_DECL(_net_inet_icmp);
 #ifdef ICMP_BANDLIM
-extern int badport_bandlim __P((int));
+extern int badport_bandlim(int);
 #endif
 #define BANDLIM_UNLIMITED -1
 #define BANDLIM_ICMP_UNREACH 0
@@ -115,6 +109,5 @@ extern int badport_bandlim __P((int));
 #define BANDLIM_RST_CLOSEDPORT 3 /* No connection, and no listeners */
 #define BANDLIM_RST_OPENPORT 4   /* No connection, listener */
 #define BANDLIM_MAX 4
-#endif /* __APPLE_API_PRIVATE */
-#endif
-#endif
+#endif KERNEL_PRIVATE
+#endif _NETINET_ICMP_VAR_H_