xnu-2782.1.97.tar.gz

[apple/xnu.git] / osfmk / mach / mach_time.h

diff --git a/osfmk/mach/mach_time.h b/osfmk/mach/mach_time.h
index 253875f0c379e75254c2b8422bf72b839db27735..16805896a1ec68ea4faaf622dbada5e004656c41 100644 (file)
--- a/osfmk/mach/mach_time.h
+++ b/osfmk/mach/mach_time.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2001-2005 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,15 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 2001 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- * 30 January 2001 (debo)
- *  Created.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #ifndef        _MACH_MACH_TIME_H_
@@ -36,10 +31,7 @@
 
 #include <mach/mach_types.h>
 
-uint64_t                       mach_absolute_time(void);
-
-kern_return_t          mach_wait_until(
-                                               uint64_t                deadline);
+#include <sys/cdefs.h>
 
 struct mach_timebase_info {
        uint32_t        numer;
@@ -49,7 +41,19 @@ struct mach_timebase_info {
 typedef struct mach_timebase_info      *mach_timebase_info_t;
 typedef struct mach_timebase_info      mach_timebase_info_data_t;
 
+__BEGIN_DECLS
+#ifndef        KERNEL
+
 kern_return_t          mach_timebase_info(
                                                mach_timebase_info_t    info);
 
+kern_return_t          mach_wait_until(
+                                               uint64_t                deadline);
+
+#endif /* KERNEL */
+
+uint64_t                       mach_absolute_time(void);
+uint64_t                       mach_approximate_time(void);
+__END_DECLS
+
 #endif /* _MACH_MACH_TIME_H_ */