xnu-517.3.15.tar.gz

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

diff --git a/bsd/net/ethernet.h b/bsd/net/ethernet.h
index de84f184e21f2e4e97e51b388eed40c7fee3444d..09c78d9ea2ed7ca729c85df7410128a5fe89e673 100644 (file)
--- a/bsd/net/ethernet.h
+++ b/bsd/net/ethernet.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@
  */
@@ -26,6 +29,7 @@
 
 #ifndef _NET_ETHERNET_H_
 #define _NET_ETHERNET_H_
+#include <sys/appleapiopts.h>
 
 /*
  * The number of bytes in an ethernet (MAC) address.
@@ -101,11 +105,13 @@ struct    ether_addr {
 #define        ETHERMTU        (ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
 #define        ETHERMIN        (ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
 
-#if KERNEL
+#ifdef KERNEL
+#ifdef __APPLE_API_PRIVATE
 struct ether_addr *ether_aton __P((char *));
+#endif /* __APPLE_API_PRIVATE */
 #endif
 
-#if !KERNEL
+#ifndef KERNEL
 #include <sys/cdefs.h>
 
 /*
@@ -115,7 +121,7 @@ __BEGIN_DECLS
 
 int    ether_hostton __P((char *, struct ether_addr *));
 int    ether_line __P((char *, struct ether_addr *, char *));
-char   *ether_ntoa __P((struct ether_addr *));
+char   *ether_ntoa __P((const struct ether_addr *));
 int    ether_ntohost __P((char *, struct ether_addr *));
 __END_DECLS
 #endif /* !KERNEL */