[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3498-g78b8b80

[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  78b8b80348fe60867792743dd9a34ec7085a5d71 (commit)
       via  7e352bc1d7aa7e82520c7594c169773e5eec5fa2 (commit)
      from  ed1d4c8b03234fe6433a5e106d1e81397178f54a (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=78b8b80348fe60867792743dd9a34ec7085a5d71
commit 78b8b80348fe60867792743dd9a34ec7085a5d71
Merge: ed1d4c8 7e352bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 30 09:23:33 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 30 09:23:33 2013 -0400

    Merge topic 'update-libarchive' into next
    
    7e352bc libarchive: Avoid struct init with variable everywhere


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e352bc1d7aa7e82520c7594c169773e5eec5fa2
commit 7e352bc1d7aa7e82520c7594c169773e5eec5fa2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 30 09:18:26 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 30 09:18:26 2013 -0400

    libarchive: Avoid struct init with variable everywhere
    
    The SGI MIPSpro compiler also dislikes struct initializations with
    variables.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c b/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c
index 2269451..622c960 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_open_filename.c
@@ -103,12 +103,9 @@ int
 archive_read_open_filename(struct archive *a, const char *filename,
     size_t block_size)
 {
-#if defined(__BORLANDC__)
-	const char *filenames[2] = { NULL, NULL };
+	const char *filenames[2];
 	filenames[0] = filename;
-#else
-	const char *filenames[2] = { filename, NULL };
-#endif
+	filenames[1] = NULL;
 	return archive_read_open_filenames(a, filenames, block_size);
 }
 

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

Summary of changes:
 .../libarchive/archive_read_open_filename.c        |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake