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.
39+
40+ tp->tv_sec = (long)((time - EPOCH) / 10000000L);
41+ tp->tv_usec = (long)(system_time.wMilliseconds * 1000);
42+ return 0;
43+}
44+#endif
17+typedef int64_t ssize_t;
18+#else
19+typedef int32_t ssize_t;
20+#endif
21+#endif
22+
I think just making MAX_TRIES an int should remove the need for this?
Yes this would be better than adding a top-level definition that could conflict with other libraries. (Also, if we did need a top-level definition, compat.h would probably be a better place to put it.)
Happy to go with whatever the consensus is.
I think you should just make MAX_TRIES an int like Cory suggested.
35@@ -32,7 +36,7 @@ void memory_cleanse(void *ptr, size_t len)
36 might try to eliminate "superfluous" memsets. If there's an easy way to
37 detect memset_s, it would be better to use that. */
38 #if defined(_MSC_VER)
39- __asm;
6@@ -7,6 +7,10 @@
7
8 #include <cstring>
9
10+#if defined(_MSC_VER)
11+#include <Windows.h> // For SecureZeroMemory.
Working around the use of the non-portable ssize_t definition is proving to be a bit tricky. Adding a typedef to random.h allows the code to build but as some reviewers pointed out it was a clunky fix.
Switching from ssize_t to int in random.h and random.cpp is not sufficient. There are also multiple uses of ssize_t in netbase.cpp and test/util_tests.cpp. A side effect of the definition in random.h was that those two classes picked up the definition.
Adding a typedef to compat.h and also adding an include for compat.h to random.h gets the definition to the missing spots BUT it introduces a re-definition compilation error because the db.h header from BerkeleyDB already has the same typedef.
After some gymnastics I have managed to come up with a set of directives that allow successful compilation, see below, however if portable code is a goal for the future it may be worth steering away from non-C++ standard types, such as ssize_t, outside of any platform specific classes?
0#ifdef _MSC_VER
1#if !defined(ssize_t)
2#ifdef _WIN64
3typedef int64_t ssize_t;
4#else
5typedef int32_t ssize_t;
6#endif
7#endif
8#endif
however if portable code is a goal for the future it may be worth steering away from non-C++ standard types, such as ssize_t, outside of any platform specific classes?
Agree, ssize_t should be used in POSIX code, as some of the POSIX functions such as read() return it. But outside it it’s better not to.
utACK, changes look sane (or at least harmless) to me now. https://github.com/bitcoin/bitcoin/pull/11558/commits/af824151d65e66e1d16e43ef00bd613e644c7fcb
0
1EDIT: Never mind. I see there were other uses of ssize_t outside of random.h/cpp. Still would be good to stop using ssize_t in inappropriate places.
8@@ -9,6 +9,7 @@
9 #include "crypto/chacha20.h"
10 #include "crypto/common.h"
11 #include "uint256.h"
12+#include "compat.h"
Labels
Windows