xnu-1228.tar.gz

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

diff --git a/osfmk/mach/time_value.h b/osfmk/mach/time_value.h
index afaff9eeed505872880a15e60af846d79fe78e17..e4f912d9e440315b66d6a705f77a5d9923c0d1ad 100644 (file)
--- a/osfmk/mach/time_value.h
+++ b/osfmk/mach/time_value.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@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -48,10 +54,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef        TIME_VALUE_H_
-#define        TIME_VALUE_H_
-
-#include <sys/appleapiopts.h>
+#ifndef        _MACH_TIME_VALUE_H_
+#define        _MACH_TIME_VALUE_H_
 
 #include <mach/machine/vm_types.h>
 
@@ -63,9 +67,8 @@ struct time_value {
        integer_t seconds;
        integer_t microseconds;
 };
-typedef        struct time_value       time_value_t;
 
-#ifdef __APPLE_API_UNSTABLE
+typedef        struct time_value       time_value_t;
 
 /*
  *     Macros to manipulate time values.  Assume that time values
@@ -90,25 +93,4 @@ typedef      struct time_value       time_value_t;
        }                                                       \
 }
 
-#endif /* __APPLE_API_UNSTABLE */
-
-#ifdef __APPLE_API_OBSOLETE
-
-/*
- *     Time value available through the mapped-time interface.
- *     Read this mapped value with
- *             do {
- *                     secs = mtime->seconds;
- *                     usecs = mtime->microseconds;
- *             } while (secs != mtime->check_seconds);
- */
-
-typedef struct mapped_time_value {
-       integer_t seconds;
-       integer_t microseconds;
-       integer_t check_seconds;
-} mapped_time_value_t;
-
-#endif /* __APPLE_API_OBSOLETE */
-
-#endif /* TIME_VALUE_H_ */
+#endif /* _MACH_TIME_VALUE_H_ */