[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-862-g6e0a8ca

[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  6e0a8ca07576308cde48d6554d7e5bacfef1451b (commit)
       via  023d01589b2313816cae715e990f0dd8b37b6e86 (commit)
       via  26bea611b12f8b2764a48d42efc57892f9b41657 (commit)
      from  8c8bd72d962dac7d52c74e7d56eae3ea93b437c0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e0a8ca07576308cde48d6554d7e5bacfef1451b
commit 6e0a8ca07576308cde48d6554d7e5bacfef1451b
Merge: 8c8bd72 023d015
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:17:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 10:17:53 2015 -0400

    Merge topic 'update-libarchive' into next
    
    023d0158 libarchive: Avoid using 'uint8_t' as bitfield type
    26bea611 libarchive: Avoid using name 'hz'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=023d01589b2313816cae715e990f0dd8b37b6e86
commit 023d01589b2313816cae715e990f0dd8b37b6e86
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 10:09:24 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 10:09:24 2015 -0400

    libarchive: Avoid using 'uint8_t' as bitfield type
    
    The IBM XL compiler does not like it.  Use plain 'unsigned' instead.

diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
index 87b3f55..e23e5e9 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c
@@ -54,14 +54,14 @@ __FBSDID("$FreeBSD$");
 
 struct private_data {
 	int		 compression_level;
-	uint8_t		 header_written:1;
-	uint8_t		 version_number:1;
-	uint8_t		 block_independence:1;
-	uint8_t		 block_checksum:1;
-	uint8_t		 stream_size:1;
-	uint8_t		 stream_checksum:1;
-	uint8_t		 preset_dictionary:1;
-	uint8_t		 block_maximum_size:3;
+	unsigned	 header_written:1;
+	unsigned	 version_number:1;
+	unsigned	 block_independence:1;
+	unsigned	 block_checksum:1;
+	unsigned	 stream_size:1;
+	unsigned	 stream_checksum:1;
+	unsigned	 preset_dictionary:1;
+	unsigned	 block_maximum_size:3;
 #if defined(HAVE_LIBLZ4) && LZ4_VERSION_MAJOR >= 1 && LZ4_VERSION_MINOR >= 2
 	int64_t		 total_in;
 	char		*out;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26bea611b12f8b2764a48d42efc57892f9b41657
commit 26bea611b12f8b2764a48d42efc57892f9b41657
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:58:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 09:58:25 2015 -0400

    libarchive: Avoid using name 'hz'
    
    AIX system headers define the symbol 'hz' as a preprocessor macro.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
index 6bd15f6..57534f3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
@@ -418,9 +418,9 @@ deconst(const void *c)
 }
 
 static char*
-xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
+xmemmem(const char *hay, const size_t hz_, const char *ndl, const size_t nz)
 {
-	const char *const eoh = hay + hz;
+	const char *const eoh = hay + hz_;
 	const char *const eon = ndl + nz;
 	const char *hp;
 	const char *np;
@@ -435,7 +435,7 @@ xmemmem(const char *hay, const size_t hz, const char *ndl, const size_t nz)
          * that happens to begin with *NEEDLE) */
 	if (nz == 0UL) {
 		return deconst(hay);
-	} else if ((hay = memchr(hay, *ndl, hz)) == NULL) {
+	} else if ((hay = memchr(hay, *ndl, hz_)) == NULL) {
 		/* trivial */
 		return NULL;
 	}

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

Summary of changes:
 .../libarchive/archive_read_support_format_warc.c      |    6 +++---
 .../libarchive/archive_write_add_filter_lz4.c          |   16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake