X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/21362eb3e66fd2c787aee132bce100a44d71a99c..4452a7af2eac33dbad800bcc91f2399d62c18f53:/bsd/sys/stat.h diff --git a/bsd/sys/stat.h b/bsd/sys/stat.h index ac8146e0b..d983d0cec 100644 --- a/bsd/sys/stat.h +++ b/bsd/sys/stat.h @@ -128,6 +128,7 @@ typedef __darwin_off_t off_t; typedef __darwin_time_t time_t; #endif + /* [XSI] The timespec structure may be defined as described in */ #ifndef _TIMESPEC #define _TIMESPEC @@ -135,6 +136,7 @@ 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 @@ -143,7 +145,7 @@ struct timespec { */ struct user_timespec { user_time_t tv_sec; /* seconds */ - __int64_t tv_nsec; /* and nanoseconds */ + int32_t tv_nsec __attribute((aligned(8))); /* and nanoseconds */ }; #endif // KERNEL #endif /* _TIMESPEC */ @@ -218,9 +220,6 @@ 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 */ @@ -251,10 +250,6 @@ 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