mirror of
https://github.com/isar/libmdbx.git
synced 2025-01-02 00:14:14 +08:00
mdbx: Merge branch 'master' into devel.
Change-Id: I4f180753fe52b54f37f4fd12af2ba1b3ca541726
This commit is contained in:
commit
b321f67ed2
@ -3256,7 +3256,7 @@ __cold const char *mdbx_liberr2str(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];
|
||||
}
|
||||
@ -19391,7 +19391,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
|
||||
};
|
||||
|
||||
|
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user