diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
| commit | 3fa9151f2610fdad23df02b2b914881286b22480 (patch) | |
| tree | ef9f91dfb3c886a59cc591739dc7ddb6f8a703a5 /src/common/compat.c | |
| parent | cd4f56a37c3513cdca3463c3638067380af29219 (diff) | |
| parent | 4458fd0cd8fa259f0ee8195e1aa86d5b7c6f8919 (diff) | |
| download | tor-3fa9151f2610fdad23df02b2b914881286b22480.tar.gz tor-3fa9151f2610fdad23df02b2b914881286b22480.zip | |
Merge branch 'win64-7260'
Conflicts:
src/or/dns.c
Diffstat (limited to 'src/common/compat.c')
| -rw-r--r-- | src/common/compat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 89f9cfa3d4..d0e516c2ce 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -425,11 +425,10 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) else *strp = strp_tmp; return r; -#elif defined(_MSC_VER) +#elif defined(HAVE__VSCPRINTF) /* On Windows, _vsnprintf won't tell us the length of the string if it * overflows, so we need to use _vcsprintf to tell how much to allocate */ int len, r; - char *res; len = _vscprintf(fmt, args); if (len < 0) { *strp = NULL; |