[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3656-ge385dfe

[Brad King]

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  e385dfe1f50e8161ea77a134ee88e89dadc59f24 (commit)
       via  4189a7f9a65d28a1237436c362fca1d7a83545e7 (commit)
      from  f8020b0c5036bbd7bc349cb72134a44c5ce38c82 (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=e385dfe1f50e8161ea77a134ee88e89dadc59f24
commit e385dfe1f50e8161ea77a134ee88e89dadc59f24
Merge: f8020b0 4189a7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 9 10:37:16 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 9 10:37:16 2014 -0400

    Merge topic 'hpux-libarchive-compile' into next
    
    4189a7f9 libarchive: fix compilation on newer HP-UX versions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4189a7f9a65d28a1237436c362fca1d7a83545e7
commit 4189a7f9a65d28a1237436c362fca1d7a83545e7
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:38:11 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..bca2e35 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.atime.tv_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