From efe400264f9769af84dd62ea6d5b96b735c14785 Mon Sep 17 00:00:00 2001 From: Burak Arslan Date: Tue, 15 Sep 2020 20:03:42 +0300 Subject: [PATCH 1/2] mdbx: minor fix msvc build (#117). --- src/core.c | 4 ++++ src/lck-posix.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/core.c b/src/core.c index 3ff00df9..51c01a43 100644 --- a/src/core.c +++ b/src/core.c @@ -19116,7 +19116,11 @@ __dll_export #endif /* MDBX_BUILD_FLAGS */ #if !(defined(MDBX_BUILD_FLAGS_CONFIG) || defined(MDBX_BUILD_FLAGS)) "undefined (please use correct build script)" +#ifdef _MSC_VER +#pragma message("warning: Build flags undefined. Please use correct build script") +#else #warning "Build flags undefined. Please use correct build script" +#endif // _MSC_VER #endif }; diff --git a/src/lck-posix.c b/src/lck-posix.c index f908cb6f..56d53eb9 100644 --- a/src/lck-posix.c +++ b/src/lck-posix.c @@ -733,7 +733,11 @@ static int __cold mdbx_ipclock_failed(MDBX_env *env, mdbx_ipclock_t *ipc, #elif MDBX_LOCKING == MDBX_LOCKING_POSIX1988 (void)ipc; #elif MDBX_LOCKING == MDBX_LOCKING_FUTEX +#ifdef _MSC_VER +#pragma message("warning: TODO") +#else #warning "TODO" +#endif (void)ipc; #else #error "FIXME" From 6a99303ec130757de25879875fa1e86e8fe94074 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Wed, 16 Sep 2020 12:18:29 +0300 Subject: [PATCH 2/2] mdbx: fix mdbx_strerror() for MDBX_BUSY error. Change-Id: Iea02f1daa3f52a9b737366e9af3c7def748ab523 --- src/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.c b/src/core.c index 51c01a43..4446fca2 100644 --- a/src/core.c +++ b/src/core.c @@ -3236,7 +3236,7 @@ static const char *__mdbx_strerr(int errnum) { " or environment is already used while opening with MDBX_EXCLUSIVE flag", }; - if (errnum >= MDBX_KEYEXIST && errnum <= MDBX_LAST_LMDB_ERRCODE) { + if (errnum >= MDBX_KEYEXIST && errnum <= MDBX_BUSY) { int i = errnum - MDBX_KEYEXIST; return tbl[i]; }