kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'hpux-libarchive-compile' 

478b1c8b libarchive: fix compilation on newer HP-UX versions
This commit is contained in:
Brad King 2014-06-09 10:28:40 -04:00 committed by CMake Topic Stage
parent d20792f302 478b1c8b36
commit 8c29d8d1e7
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
View File

@ -2862,7 +2862,7 @@ set_time(int fd, int mode, const char *name,
#endif #endif
} }
#ifdef F_SETTIMES /* Tru64 */ #ifdef F_SETTIMES
static int static int
set_time_tru64(int fd, int mode, const char *name, set_time_tru64(int fd, int mode, const char *name,
time_t atime, long atime_nsec, 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) time_t ctime, long ctime_nsec)
{ {
struct attr_timbuf tstamp; struct attr_timbuf tstamp;
struct timeval times[3]; tstamp.atime.tv_sec = atime;
times[0].tv_sec = atime; tstamp.mtime.tv_sec = mtime;
times[0].tv_usec = atime_nsec / 1000; tstamp.ctime.tv_sec = ctime;
times[1].tv_sec = mtime; #if defined (__hpux) && defined (__ia64)
times[1].tv_usec = mtime_nsec / 1000; tstamp.atime.tv_nsec = atime_nsec;
times[2].tv_sec = ctime; tstamp.mtime.tv_nsec = mtime_nsec;
times[2].tv_usec = ctime_nsec / 1000; tstamp.ctime.tv_nsec = ctime_nsec;
tstamp.atime = times[0]; #else
tstamp.mtime = times[1]; tstamp.atimetv_usec = atime_nsec / 1000;
tstamp.ctime = times[2]; tstamp.mtime.tv_usec = mtime_nsec / 1000;
tstamp.ctime.tv_usec = ctime_nsec / 1000;
#endif
return (fcntl(fd,F_SETTIMES,&tstamp)); return (fcntl(fd,F_SETTIMES,&tstamp));
} }
#endif /* Tru64 */ #endif /* F_SETTIMES */
static int static int
set_times(struct archive_write_disk *a, set_times(struct archive_write_disk *a,