From 4cf6e2b2c30926d7831358c18329c76f040eb0c6 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 16 Jan 2016 16:10:16 +0000 Subject: [PATCH 1/2] Fix 30f92f5630bbc7507708275a29a9ae7acf633a5b Needed to add the corresponding (dummy) method to unit test hardfork --- tests/unit_tests/hardfork.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit_tests/hardfork.cpp b/tests/unit_tests/hardfork.cpp index 56ec155f0..d469dadec 100644 --- a/tests/unit_tests/hardfork.cpp +++ b/tests/unit_tests/hardfork.cpp @@ -128,6 +128,7 @@ public: virtual uint8_t get_hard_fork_version(uint64_t height) const { return versions[height]; } + virtual void check_hard_fork_info() {} private: std::vector blocks; From d2a5f72f73e0e4030b521086b13b8c8efaf9ca9e Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 16 Jan 2016 16:11:11 +0000 Subject: [PATCH 2/2] Fix --db-sync-mode on Windows64 only "fastest" mode was working, others would SEGV. --- external/db_drivers/liblmdb/mdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/db_drivers/liblmdb/mdb.c b/external/db_drivers/liblmdb/mdb.c index ae32c9896..5d57f8b15 100644 --- a/external/db_drivers/liblmdb/mdb.c +++ b/external/db_drivers/liblmdb/mdb.c @@ -2429,7 +2429,7 @@ mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp) goto fail; } #ifdef _WIN32 - if (env->me_flags & MDB_WRITEMAP) { + if (!(env->me_flags & MDB_RDONLY)) { void *p; p = (MDB_page *)(env->me_map + env->me_psize * pgno); p = VirtualAlloc(p, env->me_psize * num, MEM_COMMIT,