xnu-6153.11.26.tar.gz

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

diff --git a/bsd/netinet/in_systm.h b/bsd/netinet/in_systm.h
index a29822d2422306788da2607df82a1215810c6b5f..c191fed8d7145c3ff3b31523d6cf3207427c6dff 100644 (file)
--- a/bsd/netinet/in_systm.h
+++ b/bsd/netinet/in_systm.h
@@ -1,17 +1,20 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * 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,


@@ -19,8 +22,8 @@
  * 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.
  * 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) 1982, 1986, 1993
  */
 /*
  * Copyright (c) 1982, 1986, 1993


@@ -61,6 +64,7 @@
 #ifndef _NETINET_IN_SYSTM_H_
 #define _NETINET_IN_SYSTM_H_
 #include <sys/appleapiopts.h>
 #ifndef _NETINET_IN_SYSTM_H_
 #define _NETINET_IN_SYSTM_H_
 #include <sys/appleapiopts.h>

+#include <sys/_types.h>

 
 /*
  * Miscellaneous internetwork
 
 /*
  * Miscellaneous internetwork


@@ -75,15 +79,14 @@
  * the bytes before transmission at each protocol level.  The n_ types
  * represent the types with the bytes in ``high-ender'' order.
  */
  * the bytes before transmission at each protocol level.  The n_ types
  * represent the types with the bytes in ``high-ender'' order.
  */

-typedef u_int16_t n_short;             /* short as received from the net */
-typedef u_int32_t n_long;              /* long as received from the net */
+typedef __uint16_t n_short;             /* short as received from the net */
+typedef __uint32_t n_long;              /* long as received from the net */

 
 

-typedef        u_int32_t n_time;               /* ms since 00:00 GMT, byte rev */
+typedef __uint32_t n_time;              /* ms since 00:00 GMT, byte rev */

 
 

-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
-n_time  iptime __P((void));
-#endif /* __APPLE_API_PRIVATE */
-#endif
+#ifdef BSD_KERNEL_PRIVATE
+#define ABS(v) (((v) > 0) ? (v) : -(v))

 
 

-#endif
+u_int32_t iptime(void);
+#endif /* BSD_KERNEL_PRIVATE */
+#endif /* _NETINET_IN_SYSTM_H_ */