xnu-1456.1.26.tar.gz

[apple/xnu.git] / bsd / netat / at_ddp_brt.h

diff --git a/bsd/netat/at_ddp_brt.h b/bsd/netat/at_ddp_brt.h
index d656851c47410e269b632fa26fdb2155e2a53337..781311a8cd89182e3ac8d0b3b01c648216685e40 100644 (file)
--- a/bsd/netat/at_ddp_brt.h
+++ b/bsd/netat/at_ddp_brt.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@
  */
 
 /*
@@ -30,7 +33,8 @@
 #ifndef _NETAT_AT_DDP_BRT_H_
 #define _NETAT_AT_DDP_BRT_H_
 #include <sys/appleapiopts.h>
-#ifdef __APPLE_API_PRIVATE
+#ifdef KERNEL_PRIVATE
+#ifdef __APPLE_API_OBSOLETE
 
 typedef struct {
        int                             age_flag;
@@ -55,7 +59,7 @@ typedef struct {
 #define        BRT_HASH(a)   ((a) % BRT_NB)
 
 #define        BRT_LOOK(brt, dst_net) {                                \
-       register n;                                             \
+       int n;                                          \
        brt = &at_ddp_brt[BRT_HASH(dst_net) * BRT_BSIZ];        \
        for (n = 0 ; ; brt++) {                                 \
                if (brt->net == dst_net)                        \
@@ -68,7 +72,7 @@ typedef struct {
        }
 
 #define        NEW_BRT(brt, net) {                                     \
-       register n;                                             \
+       int n;                                          \
        brt = &at_ddp_brt[BRT_HASH(net) * BRT_BSIZ];            \
        for (n = 0 ; ; brt++) {                                 \
                if (brt->age_flag == BRT_EMPTY)                 \
@@ -83,6 +87,7 @@ typedef struct {
 /* Best Router Cache */
 extern ddp_brt_t       at_ddp_brt[BRTSIZE];
 
-#endif /* __APPLE_API_PRIVATE */
+#endif /* __APPLE_API_OBSOLETE */
+#endif /* KERNEL_PRIVATE */
 #endif /* _NETAT_AT_DDP_BRT_H_ */