mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
Compile (with warnings) with mingw64
Patch from yayooo for bug 7260, forward-ported to 0.2.4.
This commit is contained in:
parent
05194cce62
commit
9dee6b1dce
2
changes/bug7260
Normal file
2
changes/bug7260
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
o Minor bugfixes:
|
||||||
|
- Compile on win64 using mingw64. Fixes bug 7260; patches from "yayooo".
|
@ -318,6 +318,7 @@ AC_CHECK_FUNCS(
|
|||||||
sysconf \
|
sysconf \
|
||||||
uname \
|
uname \
|
||||||
vasprintf \
|
vasprintf \
|
||||||
|
_vscprintf
|
||||||
)
|
)
|
||||||
|
|
||||||
if test "$enable_threads" = "yes"; then
|
if test "$enable_threads" = "yes"; then
|
||||||
@ -784,6 +785,7 @@ AC_CHECK_SIZEOF(__int64)
|
|||||||
AC_CHECK_SIZEOF(void *)
|
AC_CHECK_SIZEOF(void *)
|
||||||
AC_CHECK_SIZEOF(time_t)
|
AC_CHECK_SIZEOF(time_t)
|
||||||
AC_CHECK_SIZEOF(size_t)
|
AC_CHECK_SIZEOF(size_t)
|
||||||
|
AC_CHECK_SIZEOF(pid_t)
|
||||||
|
|
||||||
AC_CHECK_TYPES([uint, u_char, ssize_t])
|
AC_CHECK_TYPES([uint, u_char, ssize_t])
|
||||||
|
|
||||||
|
@ -425,7 +425,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
|
|||||||
else
|
else
|
||||||
*strp = strp_tmp;
|
*strp = strp_tmp;
|
||||||
return r;
|
return r;
|
||||||
#elif defined(_MSC_VER)
|
#elif defined(HAVE__VSCPRINTF)
|
||||||
/* On Windows, _vsnprintf won't tell us the length of the string if it
|
/* 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 */
|
* overflows, so we need to use _vcsprintf to tell how much to allocate */
|
||||||
int len, r;
|
int len, r;
|
||||||
|
@ -25,7 +25,9 @@
|
|||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if 0 == SIZEOF_PID_T
|
||||||
/* Windows does not define pid_t, but _getpid() returns an int. */
|
/* Windows does not define pid_t, but _getpid() returns an int. */
|
||||||
typedef int pid_t;
|
typedef int pid_t;
|
||||||
#endif
|
#endif
|
||||||
|
@ -145,6 +145,9 @@
|
|||||||
/* Define to 1 if you have the <unistd.h> header file. */
|
/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
#undef HAVE_UNISTD_H
|
#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 to 1 iff NULL is represented by a 0 in memory. */
|
||||||
#define NULL_REP_IS_ZERO_BYTES 1
|
#define NULL_REP_IS_ZERO_BYTES 1
|
||||||
|
|
||||||
@ -190,6 +193,9 @@
|
|||||||
/* The size of a `long long', as computed by sizeof. */
|
/* The size of a `long long', as computed by sizeof. */
|
||||||
#undef SIZEOF_LONG_LONG
|
#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. */
|
/* The size of a `short', as computed by sizeof. */
|
||||||
#define SIZEOF_SHORT 2
|
#define SIZEOF_SHORT 2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user