diff options
| author | George Hazan <ghazan@miranda.im> | 2017-12-18 20:36:38 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-12-18 20:36:38 +0300 |
| commit | 2626b146d53df3a5f9e7f8e9ed69c33a1145f9f3 (patch) | |
| tree | 276539f9f996b7c5b9a135755f642cab77bbbb97 /plugins | |
| parent | 6c4280ab334cab2d629c3e057090ae98a29c3e49 (diff) | |
libmdbx adaptation
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Dbx_mdb/src/mdbx/mdbx.c | 2 | ||||
| -rw-r--r-- | plugins/Dbx_mdb/src/mdbx/osal.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Dbx_mdb/src/mdbx/mdbx.c b/plugins/Dbx_mdb/src/mdbx/mdbx.c index e306208095..d55484b802 100644 --- a/plugins/Dbx_mdb/src/mdbx/mdbx.c +++ b/plugins/Dbx_mdb/src/mdbx/mdbx.c @@ -2537,7 +2537,7 @@ static int mdbx_txn_renew0(MDBX_txn *txn, unsigned flags) { r->mr_txnid = snap; mdbx_jitter4testing(false); mdbx_assert(env, r->mr_pid == mdbx_getpid()); - mdbx_assert(env, r->mr_tid == mdbx_thread_self()); + //mdbx_assert(env, r->mr_tid == mdbx_thread_self()); mdbx_assert(env, r->mr_txnid == snap); mdbx_coherent_barrier(); env->me_lck->mti_readers_refresh_flag = true; diff --git a/plugins/Dbx_mdb/src/mdbx/osal.c b/plugins/Dbx_mdb/src/mdbx/osal.c index d9026cfadf..352929f98a 100644 --- a/plugins/Dbx_mdb/src/mdbx/osal.c +++ b/plugins/Dbx_mdb/src/mdbx/osal.c @@ -151,7 +151,7 @@ __cold void mdbx_panic(const char *fmt, ...) { va_start(ap, fmt); #ifdef _MSC_VER if (IsDebuggerPresent()) { - OutputDebugString("\r\n" FIXME "\r\n"); + OutputDebugStringA("\r\n" FIXME "\r\n"); FatalExit(ERROR_UNHANDLED_ERROR); } #elif _XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L || \ @@ -772,7 +772,7 @@ int mdbx_mmap(int flags, mdbx_mmap_t *map, size_t must, size_t limit) { } NTSTATUS rc; -#ifdef _WIN64 +#if defined(_WIN64) && defined(WOF_CURRENT_VERSION) struct { WOF_EXTERNAL_INFO wof_info; union { |