[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3623-ga961728

[Rolf Eike Beer]

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  a9617282d52676d90eba56dfa48bd28254885ede (commit)
       via  5e0b060aa78667a64158a9404805f2025063fda3 (commit)
      from  28da8b3cdbb296fd3a99951aa10588e2ad5580a7 (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=a9617282d52676d90eba56dfa48bd28254885ede
commit a9617282d52676d90eba56dfa48bd28254885ede
Merge: 28da8b3 5e0b060
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jun 6 12:52:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 6 12:52:44 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e0b060aa78667a64158a9404805f2025063fda3
commit 5e0b060aa78667a64158a9404805f2025063fda3
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jun 6 17:44:16 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jun 6 17:44:16 2014 +0200

    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 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,

-----------------------------------------------------------------------

Summary of changes:
 .../libarchive/archive_write_disk_posix.c          |   26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake