xnu-1228.12.14.tar.gz

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

diff --git a/bsd/netinet/igmp_var.h b/bsd/netinet/igmp_var.h
index e73a9c76ef8ef96280a7448de6ae6c5c4b446d09..5e9f7e9833d37136e5c6d276a0035ee8bedddb7c 100644 (file)
--- a/bsd/netinet/igmp_var.h
+++ b/bsd/netinet/igmp_var.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
@@ -20,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) 1988 Stephen Deering.
@@ -65,7 +68,6 @@
 #define _NETINET_IGMP_VAR_H_
 #include <sys/appleapiopts.h>
 
-#ifdef __APPLE_API_UNSTABLE
 
 /*
  * Internet Group Management Protocol (IGMP),
@@ -88,8 +90,8 @@ struct igmpstat {
        u_int   igps_snd_reports;       /* sent membership reports */
 };
 
+#ifdef KERNEL_PRIVATE
 #ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
 #define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
 
 /*
@@ -112,17 +114,17 @@ struct igmpstat {
  */
 #define IGMP_AGE_THRESHOLD                     540
 
-void   igmp_init __P((void));
-void   igmp_input __P((struct mbuf *, int));
-void   igmp_joingroup __P((struct in_multi *));
-void   igmp_leavegroup __P((struct in_multi *));
-void   igmp_fasttimo __P((void));
-void   igmp_slowtimo __P((void));
+void   igmp_init(void) __attribute__((section("__TEXT, initcode")));
+void   igmp_input(struct mbuf *, int);
+int            igmp_joingroup(struct in_multi *);
+void   igmp_leavegroup(struct in_multi *);
+void   igmp_fasttimo(void);
+void   igmp_slowtimo(void);
 
 SYSCTL_DECL(_net_inet_igmp);
 
-#endif /* __APPLE_API_PRIVATE */
-#endif
+#endif /* KERNEL */
+#endif /* KERNEL_PRIVATE */
 
 /*
  * Names for IGMP sysctl objects
@@ -130,11 +132,11 @@ SYSCTL_DECL(_net_inet_igmp);
 #define IGMPCTL_STATS          1       /* statistics (read-only) */
 #define IGMPCTL_MAXID          2
 
+#ifdef KERNEL_PRIVATE
 #define IGMPCTL_NAMES { \
        { 0, 0 }, \
        { "stats", CTLTYPE_STRUCT }, \
 }
 
-#endif /* __APPLE_API_UNSTABLE */
+#endif /* KERNEL_PRIVATE */
 #endif
-