Nth time is maybe the charm for fixing windows readpassword build errors
This commit is contained in:
parent
6b80ff1b45
commit
db88d91ebe
10
configure.ac
10
configure.ac
|
@ -396,7 +396,6 @@ dnl Check for functions before libevent, since libevent-1.2 apparently
|
||||||
dnl exports strlcpy without defining it in a header.
|
dnl exports strlcpy without defining it in a header.
|
||||||
|
|
||||||
AC_CHECK_FUNCS(
|
AC_CHECK_FUNCS(
|
||||||
SecureZeroMemory \
|
|
||||||
_NSGetEnviron \
|
_NSGetEnviron \
|
||||||
accept4 \
|
accept4 \
|
||||||
backtrace \
|
backtrace \
|
||||||
|
@ -436,7 +435,6 @@ AC_CHECK_FUNCS(
|
||||||
uname \
|
uname \
|
||||||
usleep \
|
usleep \
|
||||||
vasprintf \
|
vasprintf \
|
||||||
_getwch \
|
|
||||||
_vscprintf
|
_vscprintf
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -445,6 +443,14 @@ if test "$bwin32" != true; then
|
||||||
AC_CHECK_FUNCS(pthread_create)
|
AC_CHECK_FUNCS(pthread_create)
|
||||||
fi
|
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)
|
AM_CONDITIONAL(BUILD_READPASSPHRASE_C, test x$ac_cv_func_readpassphrase = xno && test $bwin32 = false)
|
||||||
|
|
||||||
dnl ------------------------------------------------------
|
dnl ------------------------------------------------------
|
||||||
|
|
|
@ -73,13 +73,13 @@
|
||||||
#include <conio.h>
|
#include <conio.h>
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
/* Some mingw headers lack these. :p */
|
/* Some mingw headers lack these. :p */
|
||||||
#ifndef HAVE__GETWCH
|
#ifndef HAVE_DECL__GETWCH
|
||||||
wint_t _getwch(void);
|
wint_t _getwch(void);
|
||||||
#endif
|
#endif
|
||||||
#ifndef WEOF
|
#ifndef WEOF
|
||||||
#define WEOF (wchar_t)(0xFFFF)
|
#define WEOF (wchar_t)(0xFFFF)
|
||||||
#endif
|
#endif
|
||||||
#ifndef HAVE_SECUREZEROMEMORY
|
#ifndef HAVE_DECL_SECUREZEROMEMORY
|
||||||
PVOID SecureZeroMemory(PVOID ptr, SIZE_T cnt);
|
PVOID SecureZeroMemory(PVOID ptr, SIZE_T cnt);
|
||||||
#endif
|
#endif
|
||||||
#elif defined(HAVE_READPASSPHRASE_H)
|
#elif defined(HAVE_READPASSPHRASE_H)
|
||||||
|
|
Loading…
Reference in New Issue