summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2019-08-28 18:35:09 +0300
committerGeorge Hazan <ghazan@miranda.im>2019-08-28 18:35:09 +0300
commitdc7dfedb811ebac3b078113443da231043bd4b29 (patch)
tree04ba9abd6ba6fe57244f138048833f071f2857c1 /tools
parent491d424f91413ca196d0611c36605651b7723433 (diff)
libmdbx: merge with 0.3.2
Diffstat (limited to 'tools')
-rw-r--r--tools/mdbx_dump/src/mdbx_dump.cc3
-rw-r--r--tools/mdbx_load/src/mdbx_load.cc4
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/mdbx_dump/src/mdbx_dump.cc b/tools/mdbx_dump/src/mdbx_dump.cc
index 333aadd41c..7b01e47ca1 100644
--- a/tools/mdbx_dump/src/mdbx_dump.cc
+++ b/tools/mdbx_dump/src/mdbx_dump.cc
@@ -20,7 +20,10 @@
#pragma warning(disable : 4996) /* The POSIX name is deprecated... */
#endif /* _MSC_VER (warnings) */
+/* Avoid reference to mdbx_runtime_flags from assert() */
+#define mdbx_runtime_flags (~0u)
#include "../../libs/libmdbx/src/src/bits.h"
+
#include <ctype.h>
#define PRINT 1
diff --git a/tools/mdbx_load/src/mdbx_load.cc b/tools/mdbx_load/src/mdbx_load.cc
index 0d7068a7e8..b4cd1e5c87 100644
--- a/tools/mdbx_load/src/mdbx_load.cc
+++ b/tools/mdbx_load/src/mdbx_load.cc
@@ -22,6 +22,10 @@
#pragma warning(disable : 4996) /* The POSIX name is deprecated... */
#endif /* _MSC_VER (warnings) */
+/* Avoid reference to mdbx_runtime_flags from assert() */
+#define mdbx_runtime_flags (~0u)
+#include "../../libs/libmdbx/src/src/bits.h"
+
#include <ctype.h>
#if defined(_WIN32) || defined(_WIN64)