[Cmake-commits] CMake branch, next, updated. v3.0.0-4463-g4d5b9ce

Brad King brad.king at kitware.com
Wed Jul 23 11:40:01 EDT 2014


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  4d5b9cedbbfc835801712143fd4b87da729dbdea (commit)
       via  3119297312e0a512c71863621a137871f405788a (commit)
      from  0bf9d5879e628db98995563428cd3089f4bede3b (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=4d5b9cedbbfc835801712143fd4b87da729dbdea
commit 4d5b9cedbbfc835801712143fd4b87da729dbdea
Merge: 0bf9d58 3119297
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 23 11:40:01 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 23 11:40:01 2014 -0400

    Merge topic 'add-liblzma' into next
    
    31192973 liblzma: Port to VS 7.0


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3119297312e0a512c71863621a137871f405788a
commit 3119297312e0a512c71863621a137871f405788a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 23 11:38:18 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 23 11:38:18 2014 -0400

    liblzma: Port to VS 7.0
    
    Use the same UINT64_C suffix as that for VS 6.

diff --git a/Utilities/cmliblzma/common/sysdefs.h b/Utilities/cmliblzma/common/sysdefs.h
index 81e10c1..7481e3d 100644
--- a/Utilities/cmliblzma/common/sysdefs.h
+++ b/Utilities/cmliblzma/common/sysdefs.h
@@ -51,7 +51,7 @@
 #endif
 
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
+#if defined(_MSC_VER) && (_MSC_VER < 1310)
 #  define UINT64_C(n) n ## ui64
 #endif
 

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

Summary of changes:
 Utilities/cmliblzma/common/sysdefs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list