[Cmake-commits] [cmake-commits] king committed archive_windows.h 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive
In directory public:/mounts/ram/cvs-serv30730/Utilities/cmlibarchive/libarchive

Modified Files:
	archive_windows.h 
Log Message:
libarchive: Fix wincrypt.h inclusion on VS 6

The VS 6 version of wincrypt.h only works if _WIN32_WINNT >= 0x0400.
We block its inclusion through windows.h by defining NOCRYPT, and then
define _WIN32_WINNT and include it only when necessary.


Index: archive_windows.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_windows.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** archive_windows.h	2 Nov 2009 15:51:29 -0000	1.3
--- archive_windows.h	4 Nov 2009 21:06:17 -0000	1.4
***************
*** 60,63 ****
--- 60,64 ----
  #include <process.h>
  #include <direct.h>
+ #define NOCRYPT
  #include <windows.h>
  //#define   EFTYPE 7
***************
*** 297,300 ****
--- 298,304 ----
  /* Message digest define */
  #if !defined(HAVE_OPENSSL_MD5_H) && !defined(HAVE_OPENSSL_SHA_H)
+ # if defined(_MSC_VER) && _MSC_VER < 1300
+ #  define _WIN32_WINNT 0x0400
+ # endif
  #include <wincrypt.h>
  typedef struct {