xnu-792.24.17.tar.gz

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

diff --git a/bsd/sys/time.h b/bsd/sys/time.h
index 2801abed4430cb68f2752817ae1474e0e74cf845..a7791b3c3970261d951e40bc24ede906a72c0ad0 100644 (file)
--- a/bsd/sys/time.h
+++ b/bsd/sys/time.h
@@ -165,33 +165,17 @@ struct timespec {
 // LP64todo - should this move?
 #include <machine/types.h>     /* user_time_t */
 
-/* LP64 version of struct timespec.  time_t is a long and must grow when 
- * we're dealing with a 64-bit process.
- * WARNING - keep in sync with struct timespec
- */
-struct user_timespec {
-       user_time_t     tv_sec;         /* seconds */
-       int32_t tv_nsec __attribute((aligned(8)));      /* and nanoseconds */
-};
-
-#endif
-#endif
-
-
-#ifdef KERNEL
-#ifndef _USERTIMEVAL
-#define _USERTIMEVAL
-
-#include <machine/types.h>     /* user_time_t */
-/*
- * LP64 version of struct timeval.  time_t is a long and must grow when 
+/* LP64 version of struct timeval.  time_t is a long and must grow when 
  * we're dealing with a 64-bit process.
  * WARNING - keep in sync with struct timeval
  */
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=natural
+#endif
 
 struct user_timeval {
        user_time_t     tv_sec;         /* seconds */
-       suseconds_t     tv_usec __attribute((aligned(8)));      /* and microseconds */
+       suseconds_t     tv_usec;        /* and microseconds */
 };     
 
 struct user_itimerval {
@@ -199,9 +183,21 @@ struct     user_itimerval {
        struct  user_timeval it_value;          /* current value */
 };
 
+/* LP64 version of struct timespec.  time_t is a long and must grow when 
+ * we're dealing with a 64-bit process.
+ * WARNING - keep in sync with struct timespec
+ */
+struct user_timespec {
+       user_time_t     tv_sec;         /* seconds */
+       int32_t tv_nsec;        /* and nanoseconds */
+};
+
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=reset
 #endif
-#endif // KERNEL
 
+#endif // KERNEL
+#endif
 
 #define        TIMEVAL_TO_TIMESPEC(tv, ts) {                                   \
        (ts)->tv_sec = (tv)->tv_sec;                                    \