mirror of https://github.com/bitcoin/bitcoin
parent
5bc3b6cede
commit
8217bd1d4c
@ -1,18 +0,0 @@
|
||||
--- a/util-internal.h 2013-11-01 12:18:57.000000000 -0600
|
||||
+++ b/util-internal.h 2015-07-20 20:19:43.199560900 -0500
|
||||
@@ -299,8 +299,13 @@ HANDLE evutil_load_windows_system_librar
|
||||
|
||||
#if defined(__STDC__) && defined(__STDC_VERSION__)
|
||||
#if (__STDC_VERSION__ >= 199901L)
|
||||
-#define EV_SIZE_FMT "%zu"
|
||||
-#define EV_SSIZE_FMT "%zd"
|
||||
+ #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
|
||||
+ #define EV_SIZE_FMT "%Iu"
|
||||
+ #define EV_SSIZE_FMT "%Id"
|
||||
+ #else
|
||||
+ #define EV_SIZE_FMT "%zu"
|
||||
+ #define EV_SSIZE_FMT "%zd"
|
||||
+ #endif
|
||||
#define EV_SIZE_ARG(x) (x)
|
||||
#define EV_SSIZE_ARG(x) (x)
|
||||
#endif
|
@ -1,21 +0,0 @@
|
||||
--- old/evutil.c 2015-08-28 19:26:23.488765923 -0400
|
||||
+++ new/evutil.c 2015-08-28 19:27:41.392767019 -0400
|
||||
@@ -321,15 +321,16 @@
|
||||
int
|
||||
evutil_make_listen_socket_reuseable(evutil_socket_t sock)
|
||||
{
|
||||
-#ifndef WIN32
|
||||
int one = 1;
|
||||
+#ifndef WIN32
|
||||
/* REUSEADDR on Unix means, "don't hang on to this address after the
|
||||
* listener is closed." On Windows, though, it means "don't keep other
|
||||
* processes from binding to this address while we're using it. */
|
||||
return setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one,
|
||||
(ev_socklen_t)sizeof(one));
|
||||
#else
|
||||
- return 0;
|
||||
+ return setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*) &one,
|
||||
+ (ev_socklen_t)sizeof(one));
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in new issue