mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 09:50:29 +01:00
Code Issues Projects Releases Wiki Activity

Nth time is maybe the charm for fixing windows readpassword build errors

Browse Source
This commit is contained in:
Nick Mathewson 2015-07-12 14:34:11 -04:00
parent 6b80ff1b45
commit db88d91ebe
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -396,7 +396,6 @@ 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 \
@ -436,7 +435,6 @@ AC_CHECK_FUNCS(
uname \
usleep \
vasprintf \
_getwch \
_vscprintf
)
@ -445,6 +443,14 @@ if test "$bwin32" != true; then
AC_CHECK_FUNCS(pthread_create)
fi
if test "$bwin32" = true; then
AC_CHECK_DECLS([SecureZeroMemory, _getwch], , , [
#include <windows.h>
#include <conio.h>
#include <wchar.h>
])
fi
AM_CONDITIONAL(BUILD_READPASSPHRASE_C, test x$ac_cv_func_readpassphrase = xno && test $bwin32 = false)
dnl ------------------------------------------------------

4
src/common/compat.c
View File

@ -73,13 +73,13 @@
#include <conio.h>
#include <wchar.h>
/* Some mingw headers lack these. :p */
#ifndef HAVE__GETWCH
#ifndef HAVE_DECL__GETWCH
wint_t _getwch(void);
#endif
#ifndef WEOF
#define WEOF (wchar_t)(0xFFFF)
#endif
#ifndef HAVE_SECUREZEROMEMORY
#ifndef HAVE_DECL_SECUREZEROMEMORY
PVOID SecureZeroMemory(PVOID ptr, SIZE_T cnt);
#endif
#elif defined(HAVE_READPASSPHRASE_H)