xnu-1228.9.59.tar.gz

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

diff --git a/bsd/netinet/ip_compat.h b/bsd/netinet/ip_compat.h
index eac9e37e1f077d9b4efe2c107d07da0e15893dc9..a04817ebe88f5ce409f674b989d99ee4ff51c98c 100644 (file)
--- a/bsd/netinet/ip_compat.h
+++ b/bsd/netinet/ip_compat.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) 1993-1997 by Darren Reed.
@@ -38,13 +41,8 @@
 #ifndef        __IP_COMPAT_H__
 #define        __IP_COMPAT_H__
 
-#ifndef        __P
-# ifdef        __STDC__
-#  define      __P(x)  x
-# else
-#  define      __P(x)  ()
-#  define      const
-# endif
+#ifndef        __STDC__
+# define       const
 #endif
 
 #ifndef        SOLARIS
@@ -248,7 +246,7 @@ typedef     struct  qif     {
         */
        int     qf_hl;  /* header length */
 } qif_t;
-extern ill_t   *get_unit __P((char *));
+extern ill_t   *get_unit(char *);
 #  define      GETUNIT(n)      get_unit((n))
 # else /* SOLARIS */
 #  if defined(__sgi)
@@ -292,8 +290,8 @@ typedef struct {
 #  define      KFREE(x)        kmem_free((char *)(x), sizeof(*(x)))
 #  define      KFREES(x,s)     kmem_free((char *)(x), (s))
 #  if !SOLARIS
-extern void    m_copydata __P((struct mbuf *, int, int, caddr_t));
-extern void    m_copyback __P((struct mbuf *, int, int, caddr_t));
+extern void    m_copydata(struct mbuf *, int, int, caddr_t);
+extern void    m_copyback(struct mbuf *, int, int, caddr_t);
 #  endif
 #  ifdef __sgi
 #   include <sys/kmem.h>