[Cmake-commits] CMake branch, next, updated. v3.6.2-2622-g9a4a2c1
Brad King
brad.king at kitware.com
Thu Sep 29 11:06:40 EDT 2016
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 9a4a2c1c6252167654e5b142772b21a72dc8294a (commit)
via ba395cd6d7ac726a9f74f04478c949ea4b0ee4a5 (commit)
from 9b129dc83e1e7d558f34923533a8fad412052e0e (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=9a4a2c1c6252167654e5b142772b21a72dc8294a
commit 9a4a2c1c6252167654e5b142772b21a72dc8294a
Merge: 9b129dc ba395cd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 29 11:06:40 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 29 11:06:40 2016 -0400
Merge topic 'libarchive-mingw' into next
ba395cd6 libarchive: Fix la_ssize_t definition on MinGW
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba395cd6d7ac726a9f74f04478c949ea4b0ee4a5
commit ba395cd6d7ac726a9f74f04478c949ea4b0ee4a5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 29 11:04:22 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 29 11:04:22 2016 -0400
libarchive: Fix la_ssize_t definition on MinGW
diff --git a/Utilities/cmlibarchive/libarchive/archive.h b/Utilities/cmlibarchive/libarchive/archive.h
index 3b5104b..1fb8ab4 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_)
+# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_) || defined(__MINGW32__)
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
More information about the Cmake-commits
mailing list