[Cmake-commits] CMake branch, next, updated. v2.8.5-1906-g6ab7fa0

Brad King brad.king at kitware.com
Fri Sep 16 16:46:05 EDT 2011


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  6ab7fa01caf8b8181aa924ee119735c1451123a5 (commit)
       via  8dfe74c358c5c5b364341a5fda1a43281d5bcc97 (commit)
       via  7fca32a0bb4fa53ea95fd7f515798c21b59f1542 (commit)
      from  2b694a457f28a2b7433c38e27daa3041eba6aa83 (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=6ab7fa01caf8b8181aa924ee119735c1451123a5
commit 6ab7fa01caf8b8181aa924ee119735c1451123a5
Merge: 2b694a4 8dfe74c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 16:46:03 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 16 16:46:03 2011 -0400

    Merge topic 'libarchive-mingwrt-3.20' into next
    
    8dfe74c libarchive: Fix ssize_t detection with mingwrt 3.20
    7fca32a KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dfe74c358c5c5b364341a5fda1a43281d5bcc97
commit 8dfe74c358c5c5b364341a5fda1a43281d5bcc97
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 16:42:22 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 16 16:44:44 2011 -0400

    libarchive: Fix ssize_t detection with mingwrt 3.20
    
    This version of MinGW defines _SSIZE_T_ for ssize_t.  This patch is
    based on upstream libarchive SVN commit 3649 (Fix build with mingwrt
    3.20, 2011-08-27).
    
    Inspired-by: Tim Kientzle <kientzle at freebsd.org>

diff --git a/Utilities/cmlibarchive/libarchive/archive.h b/Utilities/cmlibarchive/libarchive/archive.h
index 9b918a8..8bc612f 100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@ -52,7 +52,7 @@
 /* These should match the types used in 'struct stat' */
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #define __LA_INT64_T    __int64
-# if defined(_SSIZE_T_DEFINED)
+# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
 #  define __LA_SSIZE_T ssize_t
 # elif defined(_WIN64)
 #  define   __LA_SSIZE_T    __int64

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

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake           |    2 +-
 Utilities/cmlibarchive/libarchive/archive.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list