diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-13 13:32:00 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-13 14:05:25 +0100 |
| commit | 68e021e3a35d1e88d6075ea8b05a8e3a40a64e29 (patch) | |
| tree | a602d99d1d242f8a603127dcbc435944e5cea52f /src/compat.h | |
| parent | ba2f19504c6b1302a93accbb50383f422c54df43 (diff) | |
| parent | fbf327b13868861c2877c5754caf5a9816f2603c (diff) | |
Merge #11558: Minimal code changes to allow msvc compilation
fbf327b Minimal code changes to allow msvc compilation. (Aaron Clauson)
Pull request description:
These changes are required to allow the Bitcoin source to build with Microsoft's C++ compiler (#11562 is also required).
I looked around for a better place for the typedef of ssize_t which is in random.h. The best candidate looks like src/compat.h but I figured including that header in random.h is a bigger change than the typedef. Note that the same typedef is in at least two other places including the OpenSSL and Berkeley DB headers so some of the Bitcoin code already picks it up.
Tree-SHA512: aa6cc6283015e08ab074641f9abdc116c4dc58574dc90f75e7a5af4cc82946d3052370e5cbe855fb6180c00f8dc66997d3724ff0412e4b7417e51b6602154825
Diffstat (limited to 'src/compat.h')
| -rw-r--r-- | src/compat.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/compat.h b/src/compat.h index 2d699159b7..89cc4709a4 100644 --- a/src/compat.h +++ b/src/compat.h @@ -31,6 +31,7 @@ #include <mswsock.h> #include <windows.h> #include <ws2tcpip.h> +#include <stdint.h> #else #include <sys/fcntl.h> #include <sys/mman.h> @@ -71,6 +72,15 @@ typedef unsigned int SOCKET; #else #define MAX_PATH 1024 #endif +#ifdef _MSC_VER +#if !defined(ssize_t) +#ifdef _WIN64 +typedef int64_t ssize_t; +#else +typedef int32_t ssize_t; +#endif +#endif +#endif #if HAVE_DECL_STRNLEN == 0 size_t strnlen( const char *start, size_t max_len); |