Move _WIN32_WINNT macro to build/cmake/config.h.in

SVN-Revision: 786

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 71cf94f866f8c9718e8be8f52cb97a78a654c609..c9a6083c05be65c8f5b1f3ad27242cde4650b343 100644 (file)
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -663,8 +663,10 @@
 /*
  *  Check for Watcom and Microsoft Visual C compilers (WIN32 only)
  */
-#if defined(__WIN32__) || defined(_WIN32) || defined(__WIN32)
+#if (defined(__WIN32__) || defined(_WIN32) || defined(__WIN32)) && !defined(__CYGWIN__)
   #define      IS_WIN32  1
+  #define      WINVER 0x0500
+  #define      _WIN32_WINNT 0x0500
 
   #if defined(__TURBOC__) || defined(__BORLANDC__) /* Borland compilers */
   #elif defined( __WATCOMC__ ) || defined(__WATCOMCPP__) /* Watcom compilers */

diff --git a/cpio/cpio_windows.c b/cpio/cpio_windows.c
index 69ed7f879ca617e1b1c347cdbb4c2172ea2acc3e..1e16ff2914b61c358de5f324eaaca5476f79aecf 100644 (file)
--- a/cpio/cpio_windows.c
+++ b/cpio/cpio_windows.c
@@ -26,7 +26,6 @@
  */
 
 #ifdef _WIN32
-#define _WIN32_WINNT   0x500
 
 #include "cpio_platform.h"
 #include <errno.h>

diff --git a/libarchive/archive_windows.c b/libarchive/archive_windows.c
index 6654d69057f883c1421b055916224b09496d31fe..752136e103f088a266e39bcd1ce51e2c63d18b02 100644 (file)
--- a/libarchive/archive_windows.c
+++ b/libarchive/archive_windows.c
@@ -45,8 +45,8 @@
  */
 
 #ifdef _WIN32
-#define _WIN32_WINNT   0x500   /* needs to use CreateHardLink() API */
 
+#include "archive_platform.h"
 #include <errno.h>
 #include <stddef.h>
 #include <sys/utime.h>
@@ -55,7 +55,6 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include <windows.h>
-#include "archive_platform.h"
 
 #define EPOC_TIME      (116444736000000000ULL)
 

diff --git a/tar/bsdtar_windows.c b/tar/bsdtar_windows.c
index f0014eeebad58319f48caad5ad607a6b71fea31a..b9c5cd712b8e5019b6b460eec9ab30f160e95470 100644 (file)
--- a/tar/bsdtar_windows.c
+++ b/tar/bsdtar_windows.c
@@ -26,7 +26,6 @@
  */
 
 #ifdef _WIN32
-#define _WIN32_WINNT   0x500
 
 #include "bsdtar_platform.h"
 #include <errno.h>