aboutsummaryrefslogtreecommitdiff
path: root/src/common/compat.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-07-10 09:16:32 -0400
committerNick Mathewson <nickm@torproject.org>2015-07-10 09:16:32 -0400
commitad0d1818540f85de7d8c205c70c0201d1c688725 (patch)
tree196d04ce3bb2d78fecbcb93ff3307e8df48b9ad4 /src/common/compat.c
parentfdf5014d1134c2e06771e1265bca2eddb0e65ada (diff)
downloadtor-ad0d1818540f85de7d8c205c70c0201d1c688725.tar.gz
tor-ad0d1818540f85de7d8c205c70c0201d1c688725.zip
Attempt yet again to make the tor-ci-windows builder happy
Diffstat (limited to 'src/common/compat.c')
-rw-r--r--src/common/compat.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/common/compat.c b/src/common/compat.c
index 68544c8bd5..7355d34ddd 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -68,12 +68,14 @@
#ifdef HAVE_CRT_EXTERNS_H
#include <crt_externs.h>
#endif
-#ifdef HAVE_READPASSPHRASE_H
+
+#ifdef _WIN32
+#include <conio.h>
+#include <wchar.h>
+#elif defined(HAVE_READPASSPHRASE_H)
#include <readpassphrase.h>
-#elif !defined(_WIN32)
-#include "tor_readpassphrase.h"
#else
-#include <conio.h>
+#include "tor_readpassphrase.h"
#endif
#ifndef HAVE_GETTIMEOFDAY