diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-03 18:37:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-03 19:02:49 (GMT) |
| commit | 2f1978632b709a9370b3cb1137375c05351d149c (patch) | |
| tree | 85980710818211b8188709643e6714e8839feee9 /Utilities/cmlibarchive/build/cmake/config.h.in | |
| parent | 23e4666cf57c31c719472debba83a43f54d351d8 (diff) | |
| parent | 64713ae3ffddf6fbbfa7ea762c3d756cb245a066 (diff) | |
| download | CMake-2f1978632b709a9370b3cb1137375c05351d149c.zip CMake-2f1978632b709a9370b3cb1137375c05351d149c.tar.gz CMake-2f1978632b709a9370b3cb1137375c05351d149c.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts in favor of the upstream side where possible.
Resolve a logical conflict in archive_windows.h where the upstream
port to Watcom was done slightly differently from ours.
Diffstat (limited to 'Utilities/cmlibarchive/build/cmake/config.h.in')
| -rw-r--r-- | Utilities/cmlibarchive/build/cmake/config.h.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Utilities/cmlibarchive/build/cmake/config.h.in b/Utilities/cmlibarchive/build/cmake/config.h.in index 750ae66..f2d2068 100644 --- a/Utilities/cmlibarchive/build/cmake/config.h.in +++ b/Utilities/cmlibarchive/build/cmake/config.h.in @@ -1112,8 +1112,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} |