diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-09 14:28:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-09 14:28:40 (GMT) |
| commit | 8c29d8d1e79ba5538368171bf89e8c55b5a58e54 (patch) | |
| tree | d18e6ce8aabb76cbafc34324aa07ce8988273164 | |
| parent | d20792f30204a5bf9a34da13104f40f2026060cf (diff) | |
| parent | 478b1c8b36e55001e8cb9ec10993d7ac1e78e189 (diff) | |
| download | CMake-8c29d8d1e79ba5538368171bf89e8c55b5a58e54.zip CMake-8c29d8d1e79ba5538368171bf89e8c55b5a58e54.tar.gz CMake-8c29d8d1e79ba5538368171bf89e8c55b5a58e54.tar.bz2 | |
Merge topic 'hpux-libarchive-compile'
478b1c8b libarchive: fix compilation on newer HP-UX versions
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c index 80389ee..394e804 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c @@ -2862,7 +2862,7 @@ set_time(int fd, int mode, const char *name, #endif } -#ifdef F_SETTIMES /* Tru64 */ +#ifdef F_SETTIMES static int set_time_tru64(int fd, int mode, const char *name, time_t atime, long atime_nsec, @@ -2870,19 +2870,21 @@ set_time_tru64(int fd, int mode, const char *name, time_t ctime, long ctime_nsec) { struct attr_timbuf tstamp; - struct timeval times[3]; - times[0].tv_sec = atime; - times[0].tv_usec = atime_nsec / 1000; - times[1].tv_sec = mtime; - times[1].tv_usec = mtime_nsec / 1000; - times[2].tv_sec = ctime; - times[2].tv_usec = ctime_nsec / 1000; - tstamp.atime = times[0]; - tstamp.mtime = times[1]; - tstamp.ctime = times[2]; + tstamp.atime.tv_sec = atime; + tstamp.mtime.tv_sec = mtime; + tstamp.ctime.tv_sec = ctime; +#if defined (__hpux) && defined (__ia64) + tstamp.atime.tv_nsec = atime_nsec; + tstamp.mtime.tv_nsec = mtime_nsec; + tstamp.ctime.tv_nsec = ctime_nsec; +#else + tstamp.atimetv_usec = atime_nsec / 1000; + tstamp.mtime.tv_usec = mtime_nsec / 1000; + tstamp.ctime.tv_usec = ctime_nsec / 1000; +#endif return (fcntl(fd,F_SETTIMES,&tstamp)); } -#endif /* Tru64 */ +#endif /* F_SETTIMES */ static int set_times(struct archive_write_disk *a, |