xnu-344.49.tar.gz

[apple/xnu.git] / iokit / IOKit / IOLib.h

diff --git a/iokit/IOKit/IOLib.h b/iokit/IOKit/IOLib.h
index 7e46f2a133a8a677c6f3ffbcfa3bab8b86d5c264..74757b7d1154c710e8d3f646e776d919d0ed7488 100644 (file)
--- a/iokit/IOKit/IOLib.h
+++ b/iokit/IOKit/IOLib.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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@
  */
@@ -33,9 +36,7 @@
 #error IOLib.h is for kernel use only
 #endif
 
-#ifndef IOKIT_DEPRECATED
-#define IOKIT_DEPRECATED       1
-#endif
+#include <sys/appleapiopts.h>
 
 #include <IOKit/system.h>
 
@@ -51,6 +52,7 @@ extern "C" {
 
 #include <kern/thread_call.h>
 #include <kern/clock.h>
+
 /*
  * min/max macros.
  */
@@ -271,7 +273,7 @@ static inline IOFixed IOFixedDivide(IOFixed a, IOFixed b)
         (((value) / (multiple)) * (multiple));
 
 
-#if IOKIT_DEPRECATED
+#ifdef __APPLE_API_OBSOLETE
 
 /* The following API is deprecated */
 
@@ -281,14 +283,14 @@ static inline IOFixed IOFixedDivide(IOFixed a, IOFixed b)
 
 void IOPanic(const char *reason);
 
-/* The AbsoluteTime clock API exported by kern/clock.h
+/* The API exported by kern/clock.h
    should be used for high resolution timing. */
 
 void IOGetTime( mach_timespec_t * clock_time);
 
 extern mach_timespec_t IOZeroTvalspec;
 
-#endif /* IOKIT_DEPRECATED */
+#endif /* __APPLE_API_OBSOLETE */
 
 #ifdef __cplusplus
 } /* extern "C" */