Commit d18215ed authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

Apparently its mingw headers are missing some stuff.
parent ad0d1818

configure.ac

+2 −0
Original line number Original line Diff line number Diff line
@@ -396,6 +396,7 @@ 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 \
@@ -435,6 +436,7 @@ AC_CHECK_FUNCS( 
        uname \

        uname \

	usleep \

	usleep \

        vasprintf \

        vasprintf \

	_getwch \

	_vscprintf

	_vscprintf

)

)

src/common/compat.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,16 @@ 
#ifdef _WIN32

#ifdef _WIN32

#include <conio.h>

#include <conio.h>

#include <wchar.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)

#elif defined(HAVE_READPASSPHRASE_H)

#include <readpassphrase.h>

#include <readpassphrase.h>

#else

#else