summaryrefslogtreecommitdiff
path: root/build/cmake
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@acm.org>2014-03-16 10:27:20 -0700
committerTim Kientzle <kientzle@acm.org>2014-03-16 10:27:20 -0700
commit6070852668fe4881d1d308983f5c87153235feff (patch)
treec3c821e15b5448ed46f62c3237b24bff16d2d037 /build/cmake
parentefb6bcb6b66b3c87468decfbe0be0aaa2b2cdac6 (diff)
parentb4dcf88934b4a26510e183cf10013a31ece0d6c4 (diff)
downloadlibarchive-6070852668fe4881d1d308983f5c87153235feff.tar.gz
Merge pull request #63 from sergiud/master
Do not redefine _WIN32_WINNT and WINVER
Diffstat (limited to 'build/cmake')
-rw-r--r--build/cmake/config.h.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index c04314ee..a6933f69 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}