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 a160aa7708c802f9db805d6df49eeb9a8e29359c..70d0fadf4c2f1a84dd9f84152b69c8635cead8fd 100644 (file)
--- a/bsd/netinet/ip_compat.h
+++ b/bsd/netinet/ip_compat.h
@@ -1,31 +1,29 @@
 /*
 /*

- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * @APPLE_LICENSE_OSREFERENCE_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. 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 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and

  * limitations under the License.
  * limitations under the License.

- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (C) 1993-1997 by Darren Reed.
  */
 /*
  * Copyright (C) 1993-1997 by Darren Reed.


@@ -114,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_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 */
 
 # define       QUAD_T          long
 #endif /* BSD > 199306 */
 


@@ -131,7 +129,7 @@ typedef u_int32_t       u_32_t;
 # if defined(__alpha__) || defined(__alpha)
 typedef unsigned int    u_32_t;
 # else
 # 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 */
 
 # endif
 #endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __sgi */
 


@@ -608,7 +606,7 @@ typedef struct icmp {
                        ip_t idi_ip;
                        /* options and then 64 bits of data */
                } id_ip;
                        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
                char    id_data[1];
        } icmp_dun;
 # define       icmp_otime      icmp_dun.id_ts.its_otime