diff options
| author | Leonid Yuriev <leo@yuriev.ru> | 2020-12-05 12:21:03 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-12-05 16:10:47 +0300 |
| commit | ff95eede6a42ae9499e8857d208afd6d48bf1c71 (patch) | |
| tree | e1c3e371ebd04d08bd0bd661245b40a2fe5e55d5 /libs/libmdbx/src/mdbx_copy.c | |
| parent | affd5ca9f5664a2f2f1a131b5a5cac6595fb2fc2 (diff) | |
libmdbx: update to 0.9.2.12 with some useful fixes.
Diffstat (limited to 'libs/libmdbx/src/mdbx_copy.c')
| -rw-r--r-- | libs/libmdbx/src/mdbx_copy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/libmdbx/src/mdbx_copy.c b/libs/libmdbx/src/mdbx_copy.c index eb3c49d1d9..cde9923308 100644 --- a/libs/libmdbx/src/mdbx_copy.c +++ b/libs/libmdbx/src/mdbx_copy.c @@ -34,7 +34,7 @@ * top-level directory of the distribution or, alternatively, at * <http://www.OpenLDAP.org/license.html>. */ -#define MDBX_BUILD_SOURCERY 47492323531afee427a3de6ddaeae26eed45bfd1b52d92fd121a5a13a9747dbb_v0_9_2_0_g092ab09 +#define MDBX_BUILD_SOURCERY b30bc0044d83cd1275fa00662c8265e39091a931353b79a46d21c9536795acb2_v0_9_2_12_g3e7459b4 #ifdef MDBX_CONFIG_H #include MDBX_CONFIG_H #endif @@ -702,6 +702,7 @@ __extern_C key_t ftok(const char *, int); #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#include <excpt.h> #include <tlhelp32.h> #include <windows.h> #include <winnt.h> @@ -736,7 +737,8 @@ static inline void *mdbx_calloc(size_t nelem, size_t size) { #ifndef mdbx_realloc static inline void *mdbx_realloc(void *ptr, size_t bytes) { - return LocalReAlloc(ptr, bytes, LMEM_MOVEABLE); + return ptr ? LocalReAlloc(ptr, bytes, LMEM_MOVEABLE) + : LocalAlloc(LMEM_FIXED, bytes); } #endif /* mdbx_realloc */ |