xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / sys / timeb.h

diff --git a/bsd/sys/timeb.h b/bsd/sys/timeb.h
index a5c92708a1fcbaa4d668d905fdf7e70f7f263901..92b94a34e56fc5e56c16b99e33389bd96a92ed6d 100644 (file)
--- a/bsd/sys/timeb.h
+++ b/bsd/sys/timeb.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000-2002 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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,


@@ -22,7 +22,7 @@
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */


@@ -74,25 +74,22 @@
 #include <sys/_types.h>
 
 /* [XSI] The time_t type shall be defined as described in <sys/types.h> */
 #include <sys/_types.h>
 
 /* [XSI] The time_t type shall be defined as described in <sys/types.h> */

-#ifndef        _TIME_T
-#define        _TIME_T
-typedef        __darwin_time_t time_t;
-#endif
+#include <sys/_types/_time_t.h>

 
 /*
  * [XSI] Structure whose address is passed as the first parameter to ftime()
  */
 struct timeb {
 
 /*
  * [XSI] Structure whose address is passed as the first parameter to ftime()
  */
 struct timeb {

-       time_t          time;           /* [XSI] Seconds since the Epoch */
-       unsigned short  millitm;        /* [XSI] Milliseconds since the Epoch */
-       short           timezone;       /* [XSI] Minutes west of CUT */
-       short           dstflag;        /* [XSI] non-zero if DST in effect */
+       time_t          time;           /* [XSI] Seconds since the Epoch */
+       unsigned short  millitm;        /* [XSI] Milliseconds since the Epoch */
+       short           timezone;       /* [XSI] Minutes west of CUT */
+       short           dstflag;        /* [XSI] non-zero if DST in effect */

 };
 
 #ifndef KERNEL
 __BEGIN_DECLS
 /* [XSI] Legacy interface */
 };
 
 #ifndef KERNEL
 __BEGIN_DECLS
 /* [XSI] Legacy interface */

-int    ftime(struct timeb *);
+int     ftime(struct timeb *);

 __END_DECLS
 #endif /* !KERNEL */
 
 __END_DECLS
 #endif /* !KERNEL */