Try one more one more time to get tor-ci-windows working

Apparently its mingw headers are missing some stuff.

diff --git a/configure.ac b/configure.ac
index 42681eb3ed931554d46d5da79fcdca050dc8e948..6acc5876108e6a7bc14890dc19a96b77fd0a1cef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -396,6 +396,7 @@ dnl Check for functions before libevent, since libevent-1.2 apparently
 dnl exports strlcpy without defining it in a header.
 
 AC_CHECK_FUNCS(
+       SecureZeroMemory \
         _NSGetEnviron \
         accept4 \
         backtrace \
@@ -435,6 +436,7 @@ AC_CHECK_FUNCS(
         uname \
        usleep \
         vasprintf \
+       _getwch \
        _vscprintf
 )
 

diff --git a/src/common/compat.c b/src/common/compat.c
index 7355d34ddd21627fd55c99ffd33bc38dce2c2cab..34f6ea2ba36f29d2688d32b76796399f1e5de99d 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -72,6 +72,16 @@
 #ifdef _WIN32
 #include <conio.h>
 #include <wchar.h>
+/* Some mingw headers lack these. :p */
+#ifndef HAVE__GETWCH
+wint_t _getwch(void);
+#endif
+#ifndef WEOF
+#define WEOF (wchar_t)(0xFFFF)
+#endif
+#ifndef HAVE_SECUREZEROMEMORY
+PVOID SecureZeroMemory(PVOID ptr, SIZE_T cnt);
+#endif
 #elif defined(HAVE_READPASSPHRASE_H)
 #include <readpassphrase.h>
 #else