diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2008-09-01 11:48:21 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2008-09-01 11:48:21 +0200 |
| commit | 60ef785ec6fc8229f787147d21e48deeb038d00e (patch) | |
| tree | 52abd6d836c14f40a08533e4c0a0a8faec5eb557 /zlib | |
| parent | c0de944fdb2cff16b1ca9cc344e356f68c38d90a (diff) | |
| parent | 49bd2c865aa37c1d8aa9d9b10f5e2d8b8509d360 (diff) | |
| download | mariadb-git-60ef785ec6fc8229f787147d21e48deeb038d00e.tar.gz | |
merge
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 |