diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-10-04 17:38:24 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-10-04 17:38:24 +0200 |
| commit | 73fe3c3f780570fce745ae5237fa51d7cc670196 (patch) | |
| tree | 243b4ac5191e1770ef747bfe8b01b0390f16ab56 /zlib | |
| parent | 92d3010dc1bb4b20c020f7e41850fdebf9cb05c2 (diff) | |
| parent | 34acfc1e6a078a077d4a4c151f9e656ff03cb6e7 (diff) | |
| download | mariadb-git-73fe3c3f780570fce745ae5237fa51d7cc670196.tar.gz | |
Merge main 5.0 branch -> 5.0-build (team tree).
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/zutil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zlib/zutil.h b/zlib/zutil.h index b7d5eff81b6..4482957d6ac 100644 --- a/zlib/zutil.h +++ b/zlib/zutil.h @@ -194,7 +194,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # ifdef __TURBOC__ # define NO_vsnprintf # endif -# ifdef WIN32 +# if defined(WIN32) && (!defined(_MSC_VER) || _MSC_VER < 1500) /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ # if !defined(vsnprintf) && !defined(NO_vsnprintf) # define vsnprintf _vsnprintf |