From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 18 Mar 2009 01:54:17 +0000 (-0400)
Subject: Move _WIN32_WINNT macro to build/cmake/config.h.in
X-Git-Tag: v2.7.0~148
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=525697361c65f08088f8d18ecbf8ab131f90cae0;p=thirdparty%2Flibarchive.git

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 71cf94f86..c9a6083c0 100644
--- 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 69ed7f879..1e16ff291 100644
--- 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 6654d6905..752136e10 100644
--- 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 f0014eeeb..b9c5cd712 100644
--- 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>