[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3637-gcf56e03
Brad King
brad.king at kitware.com
Mon Jun 9 10:14:47 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via cf56e032eb6afef5a0fc8b974e6a4820b8cb9711 (commit)
via 478b1c8b36e55001e8cb9ec10993d7ac1e78e189 (commit)
from 68bb4f232faf7882cc702502e4be13ea5c3aedc6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf56e032eb6afef5a0fc8b974e6a4820b8cb9711
commit cf56e032eb6afef5a0fc8b974e6a4820b8cb9711
Merge: 68bb4f2 478b1c8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 9 10:14:46 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 9 10:14:46 2014 -0400
Merge topic 'hpux-libarchive-compile' into next
478b1c8b libarchive: fix compilation on newer HP-UX versions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=478b1c8b36e55001e8cb9ec10993d7ac1e78e189
commit 478b1c8b36e55001e8cb9ec10993d7ac1e78e189
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jun 6 17:44:16 2014 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 9 10:15:27 2014 -0400
libarchive: fix compilation on newer HP-UX versions
Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different
struct for the timing information.
Suggested-by: Eric Berge <ericmberge at gmail.com>
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
index b69c873..962f2ca 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
@@ -2861,7 +2861,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,
@@ -2869,19 +2869,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,
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list