xnu-2050.7.9.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 a39802e7f7feecda3cb554b7d6a94462b68f58c3..70d0fadf4c2f1a84dd9f84152b69c8635cead8fd 100644 (file)
--- a/bsd/netinet/ip_compat.h
+++ b/bsd/netinet/ip_compat.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (C) 1993-1997 by Darren Reed.
@@ -35,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
@@ -111,7 +112,7 @@ struct  ether_addr {
 # define       U_QUAD_T        u_quad_t
 # define       QUAD_T          quad_t
 #else /* BSD > 199306 */
-# define       U_QUAD_T        u_long
+# define       U_QUAD_T        u_int32_t
 # define       QUAD_T          long
 #endif /* BSD > 199306 */
 
@@ -128,7 +129,7 @@ typedef u_int32_t       u_32_t;
 # if defined(__alpha__) || defined(__alpha)
 typedef unsigned int    u_32_t;
 # else
-typedef unsigned long   u_32_t;
+typedef u_int32_t   u_32_t;
 # endif
 #endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __sgi */
 
@@ -245,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)
@@ -289,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>
@@ -605,7 +606,7 @@ typedef struct icmp {
                        ip_t idi_ip;
                        /* options and then 64 bits of data */
                } id_ip;
-               u_long  id_mask;
+               u_int32_t       id_mask;
                char    id_data[1];
        } icmp_dun;
 # define       icmp_otime      icmp_dun.id_ts.its_otime