xnu-2422.1.72.tar.gz

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

diff --git a/osfmk/mach/mk_timer.h b/osfmk/mach/mk_timer.h
index a1744efb184835fccf4e7732ced1f51572f786f6..396c1a1639164ec3aef6600a0cfe3d712c279c6c 100644 (file)
--- a/osfmk/mach/mk_timer.h
+++ b/osfmk/mach/mk_timer.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-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,7 +23,7 @@
  * 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) 2000 Apple Computer, Inc.  All rights reserved.
@@ -35,6 +38,9 @@
 #define        _MACH_MK_TIMER_H_
 
 #include <mach/mach_time.h>
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
 
 mach_port_name_t       mk_timer_create(void);
 
@@ -49,12 +55,14 @@ kern_return_t       mk_timer_cancel(
                                        mach_port_name_t        name,
                                        uint64_t                        *result_time);
 
+__END_DECLS
+
+#pragma pack(4)
 struct mk_timer_expire_msg {
        mach_msg_header_t       header;
-       uint64_t                        time_of_arming;
-       uint64_t                        armed_time;
-       uint64_t                        time_of_posting;
+       uint64_t                        unused[3];
 };
+#pragma pack()
 
 typedef struct mk_timer_expire_msg             mk_timer_expire_msg_t;