diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-07-10 09:57:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-07-10 09:59:29 -0400 |
| commit | d18215ed1640b5a7dcbb81588ef5a173a22200f3 (patch) | |
| tree | a21bccf3d886cb6cc0310e7648971a9feccf9e34 | |
| parent | ad0d1818540f85de7d8c205c70c0201d1c688725 (diff) | |
| download | tor-d18215ed1640b5a7dcbb81588ef5a173a22200f3.tar.gz tor-d18215ed1640b5a7dcbb81588ef5a173a22200f3.zip | |
Try one more one more time to get tor-ci-windows working
Apparently its mingw headers are missing some stuff.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/common/compat.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 42681eb3ed..6acc587610 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 7355d34ddd..34f6ea2ba3 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 |