[Cmake-commits] CMake branch, next, updated. v2.8.4-1561-g8346457

[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  83464577de235ee53d6f3b3c79fea1a365cb8a32 (commit)
       via  eb6f461fc1a383c19cc1be62663f682d1ac108ff (commit)
      from  cf8635b7c44267398ad22042607cee084882ec22 (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=83464577de235ee53d6f3b3c79fea1a365cb8a32
commit 83464577de235ee53d6f3b3c79fea1a365cb8a32
Merge: cf8635b eb6f461
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 18 10:11:46 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 18 10:11:46 2011 -0400

    Merge topic 'string-RANDOM-seed' into next
    
    eb6f461 VS 6: Define _WIN32_WINNT to load wincrypt.h correctly


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb6f461fc1a383c19cc1be62663f682d1ac108ff
commit eb6f461fc1a383c19cc1be62663f682d1ac108ff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 18 10:09:23 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 18 10:09:23 2011 -0400

    VS 6: Define _WIN32_WINNT to load wincrypt.h correctly

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 4167355..1491a99 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -9,6 +9,9 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
+#if defined(_MSC_VER) && _MSC_VER < 1300
+# define _WIN32_WINNT 0x0400 /* for wincrypt.h */
+#endif
 #include "cmSystemTools.h"   
 #include <ctype.h>
 #include <errno.h>
@@ -2236,6 +2239,9 @@ bool cmSystemTools::FileTimeSet(const char* fname, cmSystemToolsFileTime* t)
 
 //----------------------------------------------------------------------------
 #ifdef _WIN32
+# ifndef CRYPT_SILENT
+#  define CRYPT_SILENT 0x40 /* Not defined by VS 6 version of header.  */
+# endif
 static int WinCryptRandom(void* data, size_t size)
 {
   int result = 0;

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

Summary of changes:
 Source/cmSystemTools.cxx |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake