xnu-792.18.15.tar.gz

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

diff --git a/bsd/net/net_osdep.h b/bsd/net/net_osdep.h
index df43e22e3e997759507fcf08cbe2359cf9f09302..4208380cf77dcdfa8517ada3e5276664c21ee28b 100644 (file)
--- a/bsd/net/net_osdep.h
+++ b/bsd/net/net_osdep.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * 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
  * 
  * 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
  * 
  * 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.
  * 
  * 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) 1995, 1996, 1997, and 1998 WIDE Project.
  */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.


@@ -253,10 +256,10 @@
 #ifndef __NET_NET_OSDEP_H_DEFINED_
 #define __NET_NET_OSDEP_H_DEFINED_
 #include <sys/appleapiopts.h>
 #ifndef __NET_NET_OSDEP_H_DEFINED_
 #define __NET_NET_OSDEP_H_DEFINED_
 #include <sys/appleapiopts.h>

-#ifdef KERNEL
+#ifdef KERNEL_PRIVATE

 
 struct ifnet;
 
 struct ifnet;

-extern const char *if_name __P((struct ifnet *));
+extern const char *if_name(struct ifnet *);

 
 #define HAVE_OLD_BPF
 
 
 #define HAVE_OLD_BPF
 


@@ -275,5 +278,5 @@ extern const char *if_name __P((struct ifnet *));
 #define WITH_CONVERT_IP_OFF
 #endif
 
 #define WITH_CONVERT_IP_OFF
 #endif
 

-#endif /*_KERNEL*/
+#endif /* KERNEL_PRIVATE */

 #endif /*__NET_NET_OSDEP_H_DEFINED_ */
 #endif /*__NET_NET_OSDEP_H_DEFINED_ */