xnu-792.21.3.tar.gz

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

diff --git a/bsd/sys/stat.h b/bsd/sys/stat.h
index d983d0cec291d8d94fed03dff52ba2e9060209d5..ac8146e0b36b253171c4b68d8e08082b26085866 100644 (file)
--- a/bsd/sys/stat.h
+++ b/bsd/sys/stat.h
@@ -128,7 +128,6 @@ typedef __darwin_off_t              off_t;
 typedef        __darwin_time_t         time_t;
 #endif
 
-
 /* [XSI] The timespec structure may be defined as described in <time.h> */
 #ifndef _TIMESPEC
 #define _TIMESPEC
@@ -136,7 +135,6 @@ struct timespec {
        time_t  tv_sec;         /* seconds */
        long    tv_nsec;        /* and nanoseconds */
 };
-
 // LP64todo - should this move?
 #ifdef KERNEL
 /* LP64 version of struct timespec.  time_t is a long and must grow when 
@@ -145,7 +143,7 @@ struct timespec {
  */
 struct user_timespec {
        user_time_t     tv_sec;         /* seconds */
-       int32_t tv_nsec __attribute((aligned(8)));      /* and nanoseconds */
+       __int64_t       tv_nsec;        /* and nanoseconds */
 };
 #endif // KERNEL
 #endif /* _TIMESPEC */
@@ -220,6 +218,9 @@ struct stat {
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with struct stat
  */
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=natural
+#endif
 
 struct user_stat {
        dev_t           st_dev;         /* [XSI] ID of device containing file */
@@ -250,6 +251,10 @@ struct user_stat {
        __int64_t       st_qspare[2];   /* RESERVED: DO NOT USE! */
 };
 
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=reset
+#endif
+
 extern void munge_stat(struct stat *sbp, struct user_stat *usbp);
 
 #endif // KERNEL