]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Attempt yet again to make the tor-ci-windows builder happy
authorNick Mathewson <nickm@torproject.org>
Fri, 10 Jul 2015 13:16:32 +0000 (09:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 10 Jul 2015 13:16:32 +0000 (09:16 -0400)
src/common/compat.c

index 68544c8bd5b2ee41928a804d6b0a53320a611da3..7355d34ddd21627fd55c99ffd33bc38dce2c2cab 100644 (file)
 #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