[tor-commits] [tor/master] Attempt yet again to make the tor-ci-windows builder happy

[nickm at torproject.org]

commit ad0d1818540f85de7d8c205c70c0201d1c688725
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 10 09:16:32 2015 -0400

    Attempt yet again to make the tor-ci-windows builder happy
---
 src/common/compat.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index 68544c8..7355d34 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