diff options
| author | Erwin Jansen <jansene@google.com> | 2019-02-12 22:19:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-12 22:19:14 +0000 |
| commit | 7656f9eff09cc38244978773777ee64b7b31155d (patch) | |
| tree | c08828d428c86e8232f441363d9da7c0ac5f5dc8 | |
| parent | 2e4f69014fda611baf61c90331db19f08865210f (diff) | |
| parent | cc209a1648de25047cb37735f18fb10f7982df36 (diff) | |
| download | zlib-emu-29.0-release.tar.gz | |
Merge "Make zlib headers compatible with MSVC" into emu-master-devemu-32-releaseemu-32-devemu-31-stable-releaseemu-31-releaseemu-30-releaseemu-29.0-releaseaosp-emu-30-release
| -rw-r--r-- | zconf.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -472,7 +472,9 @@ typedef uLong FAR uLongf; #endif #ifndef Z_SOLO # if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) -# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ +# ifndef _MSC_VER +# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ +# endif # ifdef VMS # include <unixio.h> /* for off_t */ # endif |