monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 13:09:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #614

Browse source 
d2a5f72 Fix --db-sync-mode on Windows64 (Howard Chu)
4cf6e2b Fix 30f92f5630 (Howard Chu)
This commit is contained in:
Riccardo Spagni 2016-01-17 22:30:05 +02:00
commit d42aca8756
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/db_drivers/liblmdb/mdb.c vendored
View file

@ -2429,7 +2429,7 @@ mdb_page_alloc(MDB_cursor *mc, int num, MDB_page **mp)
goto fail; goto fail;
} }
#ifdef _WIN32 #ifdef _WIN32
if (env->me_flags & MDB_WRITEMAP) { if (!(env->me_flags & MDB_RDONLY)) {
void *p; void *p;
p = (MDB_page *)(env->me_map + env->me_psize * pgno); p = (MDB_page *)(env->me_map + env->me_psize * pgno);
p = VirtualAlloc(p, env->me_psize * num, MEM_COMMIT, p = VirtualAlloc(p, env->me_psize * num, MEM_COMMIT,

1
tests/unit_tests/hardfork.cpp
View file

@ -128,6 +128,7 @@ public:
virtual uint8_t get_hard_fork_version(uint64_t height) const { virtual uint8_t get_hard_fork_version(uint64_t height) const {
return versions[height]; return versions[height];
} }
virtual void check_hard_fork_info() {}
private: private:
std::vector<block> blocks; std::vector<block> blocks;