[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3652-g8490490

[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  84904906b77cbb58ae976aab8466deda4e6426db (commit)
       via  c1ddd77d0c1070a9bf791c24cd47b42ca8cdb96f (commit)
      from  d1502b34a3f0bb7c7fc0ffeae60c56e056a5d052 (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=84904906b77cbb58ae976aab8466deda4e6426db
commit 84904906b77cbb58ae976aab8466deda4e6426db
Merge: d1502b3 c1ddd77
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 9 10:36:02 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 9 10:36:02 2014 -0400

    Merge topic 'hpux-libarchive-compile' into next
    
    c1ddd77d libarchive: Fix compilation on Tru64 with F_SETTIMES


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1ddd77d0c1070a9bf791c24cd47b42ca8cdb96f
commit c1ddd77d0c1070a9bf791c24cd47b42ca8cdb96f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 9 10:36:41 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 9 10:36:41 2014 -0400

    libarchive: Fix compilation on Tru64 with F_SETTIMES
    
    The parent commit left a typo in the conditional code path for Tru64.
    Add the missing '.'.

diff --git a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
index 962f2ca..bca2e35 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
@@ -2877,7 +2877,7 @@ set_time_tru64(int fd, int mode, const char *name,
 	tstamp.mtime.tv_nsec = mtime_nsec;
 	tstamp.ctime.tv_nsec = ctime_nsec;
 #else
-	tstamp.atimetv_usec = atime_nsec / 1000;
+	tstamp.atime.tv_usec = atime_nsec / 1000;
 	tstamp.mtime.tv_usec = mtime_nsec / 1000;
 	tstamp.ctime.tv_usec = ctime_nsec / 1000;
 #endif

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

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake