ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 18:54:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: Merge branch 'master' into devel.

Browse Source 
Change-Id: I4f180753fe52b54f37f4fd12af2ba1b3ca541726
This commit is contained in:
Leonid Yuriev 2020-09-19 01:47:12 +03:00
commit b321f67ed2
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.c
View File

@ -3256,7 +3256,7 @@ __cold const char *mdbx_liberr2str(int errnum) {
" or environment is already used while opening with MDBX_EXCLUSIVE flag", " 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; int i = errnum - MDBX_KEYEXIST;
return tbl[i]; return tbl[i];
} }
@ -19391,7 +19391,11 @@ __dll_export
#endif /* MDBX_BUILD_FLAGS */ #endif /* MDBX_BUILD_FLAGS */
#if !(defined(MDBX_BUILD_FLAGS_CONFIG) || defined(MDBX_BUILD_FLAGS)) #if !(defined(MDBX_BUILD_FLAGS_CONFIG) || defined(MDBX_BUILD_FLAGS))
"undefined (please use correct build script)" "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" #warning "Build flags undefined. Please use correct build script"
#endif // _MSC_VER
#endif #endif
}; };

4
src/lck-posix.c
View File

@ -733,7 +733,11 @@ static int __cold mdbx_ipclock_failed(MDBX_env *env, mdbx_ipclock_t *ipc,
#elif MDBX_LOCKING == MDBX_LOCKING_POSIX1988 #elif MDBX_LOCKING == MDBX_LOCKING_POSIX1988
(void)ipc; (void)ipc;
#elif MDBX_LOCKING == MDBX_LOCKING_FUTEX #elif MDBX_LOCKING == MDBX_LOCKING_FUTEX
#ifdef _MSC_VER
#pragma message("warning: TODO")
#else
#warning "TODO" #warning "TODO"
#endif
(void)ipc; (void)ipc;
#else #else
#error "FIXME" #error "FIXME"