Commit 9dee6b1d authored by Nick Mathewson's avatar Nick Mathewson 👁
Browse files

Compile (with warnings) with mingw64

Patch from yayooo for bug 7260, forward-ported to 0.2.4.
parent 05194cce
o Minor bugfixes:
- Compile on win64 using mingw64. Fixes bug 7260; patches from "yayooo".
......@@ -318,6 +318,7 @@ AC_CHECK_FUNCS(
sysconf \
uname \
vasprintf \
_vscprintf
)
if test "$enable_threads" = "yes"; then
......@@ -784,6 +785,7 @@ AC_CHECK_SIZEOF(__int64)
AC_CHECK_SIZEOF(void *)
AC_CHECK_SIZEOF(time_t)
AC_CHECK_SIZEOF(size_t)
AC_CHECK_SIZEOF(pid_t)
AC_CHECK_TYPES([uint, u_char, ssize_t])
......
......@@ -425,7 +425,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
else
*strp = strp_tmp;
return r;
#elif defined(_MSC_VER)
#elif defined(HAVE__VSCPRINTF)
/* On Windows, _vsnprintf won't tell us the length of the string if it
* overflows, so we need to use _vcsprintf to tell how much to allocate */
int len, r;
......
......@@ -25,7 +25,9 @@
#ifdef _WIN32
#include <windows.h>
#endif
#if 0 == SIZEOF_PID_T
/* Windows does not define pid_t, but _getpid() returns an int. */
typedef int pid_t;
#endif
......
......@@ -145,6 +145,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `_vscprintf' function. */
#define HAVE__VSCPRINTF 1
/* Define to 1 iff NULL is represented by a 0 in memory. */
#define NULL_REP_IS_ZERO_BYTES 1
......@@ -190,6 +193,9 @@
/* The size of a `long long', as computed by sizeof. */
#undef SIZEOF_LONG_LONG
/* The size of `pid_t', as computed by sizeof. */
#define SIZEOF_PID_T 0
/* The size of a `short', as computed by sizeof. */
#define SIZEOF_SHORT 2
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment