[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-857-g3d10154

[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  3d1015405b77213c46a1795a1106b0a7914899ac (commit)
       via  6d32d5361e497f6b0e27647682c3004be2d40ff3 (commit)
      from  e6d7f7695df7997fe20a4f14e8710f95bb87bff9 (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=3d1015405b77213c46a1795a1106b0a7914899ac
commit 3d1015405b77213c46a1795a1106b0a7914899ac
Merge: e6d7f76 6d32d53
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:39:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 09:39:56 2015 -0400

    Merge topic 'update-libarchive' into next
    
    6d32d536 libarchive: Avoid non-portable u_int8_t


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

    libarchive: Avoid non-portable u_int8_t
    
    Use uint8_t that we prepare in config.h instead.

diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index 7891077..f4d4254 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -137,9 +137,9 @@ archive_random(void *buf, size_t nbytes)
 #endif				/* !__GNUC__ */
 
 struct arc4_stream {
-	u_int8_t i;
-	u_int8_t j;
-	u_int8_t s[256];
+	uint8_t i;
+	uint8_t j;
+	uint8_t s[256];
 };
 
 static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
@@ -159,7 +159,7 @@ static struct arc4_stream rs;
 static pid_t arc4_stir_pid;
 static int arc4_count;
 
-static inline u_int8_t arc4_getbyte(void);
+static inline uint8_t arc4_getbyte(void);
 static void arc4_stir(void);
 
 static inline void
@@ -177,7 +177,7 @@ static inline void
 arc4_addrandom(u_char *dat, int datlen)
 {
 	int     n;
-	u_int8_t si;
+	uint8_t si;
 
 	rs.i--;
 	for (n = 0; n < 256; n++) {
@@ -239,10 +239,10 @@ arc4_stir_if_needed(void)
 	}
 }
 
-static inline u_int8_t
+static inline uint8_t
 arc4_getbyte(void)
 {
-	u_int8_t si, sj;
+	uint8_t si, sj;
 
 	rs.i = (rs.i + 1);
 	si = rs.s[rs.i];

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

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_random.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake