From: Sergiu Dotenco <sergiu.dotenco@th-nuernberg.de>
Date: Mon, 27 Jan 2014 13:51:10 +0000 (+0100)
Subject: Do not redefine _WIN32_WINNT and WINVER
X-Git-Tag: v3.1.900a~311^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F63%2Fhead;p=thirdparty%2Flibarchive.git

Do not redefine _WIN32_WINNT and WINVER
---

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index c04314ee5..a6933f694 100644
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -1106,8 +1106,13 @@ typedef uint64_t uintmax_t;
 #cmakedefine _LARGE_FILES ${_LARGE_FILES}
 
 /* Define for Windows to use Windows 2000+ APIs. */
+#ifndef _WIN32_WINNT
 #cmakedefine _WIN32_WINNT ${_WIN32_WINNT}
+#endif // _WIN32_WINNT
+
+#ifndef WINVER
 #cmakedefine WINVER ${WINVER}
+#endif // WINVER
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #cmakedefine const ${const}