[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-159-g2c86958

[Nils Gladitz]

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  2c86958b1a86c1ad6af7758cea3153ba4615c801 (commit)
       via  81ade2e0aaed6ccafc76b05cf5e679723f523908 (commit)
      from  f61f981a2a14bff9654f6e30c5f33c8356900880 (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=2c86958b1a86c1ad6af7758cea3153ba4615c801
commit 2c86958b1a86c1ad6af7758cea3153ba4615c801
Merge: f61f981 81ade2e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 16 16:56:36 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 16 16:56:36 2016 -0500

    Merge topic 'unix-timestamps' into next
    
    81ade2e0 !fixup CMake: Fix _mkgtime use in TIMESTAMP implementation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ade2e0aaed6ccafc76b05cf5e679723f523908
commit 81ade2e0aaed6ccafc76b05cf5e679723f523908
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 16 22:56:16 2016 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Feb 16 22:56:16 2016 +0100

    !fixup CMake: Fix _mkgtime use in TIMESTAMP implementation

diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index b2f149c..302ea6d 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -100,8 +100,8 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT,
 //----------------------------------------------------------------------------
 time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const
 {
-#ifdef _MSC_VER
-  return _mkgmtime(tm);
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+  return _mkgmtime(&tm);
 #else
   // From Linux timegm() manpage.
 

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

Summary of changes:
 Source/cmTimestamp.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake