summaryrefslogtreecommitdiff
path: root/evutil.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-05-29 13:32:47 -0400
committerNick Mathewson <nickm@torproject.org>2013-05-29 13:32:47 -0400
commitc307a250d4094aa5d82065bdf52fc1ec311aa072 (patch)
treeadceb0c542e201d0c2b0754d6a072b48d0d42e85 /evutil.c
parent0ac2ed655aa99d4927fd1f9d740d789cfb380ad0 (diff)
parente826f19e05b65ffea1a1699160cee7516962c939 (diff)
downloadlibevent-c307a250d4094aa5d82065bdf52fc1ec311aa072.tar.gz
Merge remote-tracking branch 'origin/patches-2.0'
Diffstat (limited to 'evutil.c')
-rw-r--r--evutil.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/evutil.c b/evutil.c
index 60e6986b..c2a29a6c 100644
--- a/evutil.c
+++ b/evutil.c
@@ -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);