commit d18215ed1640b5a7dcbb81588ef5a173a22200f3 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 10 09:57:22 2015 -0400

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

Apparently its mingw headers are missing some stuff. --- configure.ac | 2 ++ src/common/compat.c | 10 ++++++++++ 2 files changed, 12 insertions(+)

diff --git a/configure.ac b/configure.ac index 42681eb..6acc587 100644 --- 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 7355d34..34f6ea2 100644 --- 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