[Cmake-commits] CMake branch, next, updated. v3.6.2-2628-g1e6aedd

[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  1e6aedd75ec89b3ed7c5a9da8cecf9f3e64266ff (commit)
       via  5bfdb484927012543c6703ce82864c49365c241f (commit)
      from  05541949dce624d7e67d44f03606a1afa16f0ee6 (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=1e6aedd75ec89b3ed7c5a9da8cecf9f3e64266ff
commit 1e6aedd75ec89b3ed7c5a9da8cecf9f3e64266ff
Merge: 0554194 5bfdb48
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 29 11:46:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 29 11:46:28 2016 -0400

    Merge topic 'libarchive-mingw' into next
    
    5bfdb484 Revert "libarchive: Fix la_ssize_t definition on MinGW"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bfdb484927012543c6703ce82864c49365c241f
commit 5bfdb484927012543c6703ce82864c49365c241f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 29 11:45:50 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 29 11:45:50 2016 -0400

    Revert "libarchive: Fix la_ssize_t definition on MinGW"
    
    This reverts commit ba395cd6d7ac726a9f74f04478c949ea4b0ee4a5.
    This was only needed on mingw.org mingw32, and we are dropping that.

diff --git a/Utilities/cmlibarchive/libarchive/archive.h b/Utilities/cmlibarchive/libarchive/archive.h
index 1fb8ab4..3b5104b 100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@ -83,7 +83,7 @@ typedef int64_t la_int64_t;
 # endif
 #define __LA_SSIZE_T_DEFINED
 # if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
-#  if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_) || defined(__MINGW32__)
+#  if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
 typedef ssize_t la_ssize_t;
 #  elif defined(_WIN64)
 typedef __int64 la_ssize_t;

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

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


hooks/post-receive
-- 
CMake