From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 10 Jul 2015 13:16:32 +0000 (-0400)
Subject: Attempt yet again to make the tor-ci-windows builder happy
X-Git-Tag: tor-0.2.7.2-alpha~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad0d1818540f85de7d8c205c70c0201d1c688725;p=thirdparty%2Ftor.git

Attempt yet again to make the tor-ci-windows builder happy
---

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