Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2013-05-29 13:32:47 -04:00
commit c307a250d4

View File

@ -1794,7 +1794,7 @@ evutil_vsnprintf(char *buf, size_t buflen, const char *format, va_list ap)
int r;
if (!buflen)
return 0;
#ifdef _MSC_VER
#if defined(_MSC_VER) || defined(WIN32)
r = _vsnprintf(buf, buflen, format, ap);
if (r < 0)
r = _vscprintf(format, ap);