From a4b13dbed9ff21c3b992ee21ba708730186296e4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 25 Apr 2020 11:57:29 +0300 Subject: libmdbx: merge with 0.7 final version --- tools/mdbx_load/src/mdbx_load.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools/mdbx_load') diff --git a/tools/mdbx_load/src/mdbx_load.cc b/tools/mdbx_load/src/mdbx_load.cc index 567ad5b93a..d9f7f872bd 100644 --- a/tools/mdbx_load/src/mdbx_load.cc +++ b/tools/mdbx_load/src/mdbx_load.cc @@ -23,13 +23,13 @@ #endif /* _MSC_VER (warnings) */ #define MDBX_TOOLS /* Avoid using internal mdbx_assert() */ -#include "../../libs/libmdbx/src/src/elements/internals.h" +#include "../../libs/libmdbx/src/src/internals.h" #include #if defined(_WIN32) || defined(_WIN64) -#include "../../libs/libmdbx/src/src/tools/wingetopt.h" -#include "../../libs/libmdbx/src/src/tools/wingetopt.c" +#include "../../libs/libmdbx/src/src/wingetopt.h" +#include "../../libs/libmdbx/src/src/wingetopt.c" static volatile BOOL user_break; static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) { @@ -342,7 +342,8 @@ static void usage(void) { "dbpath\n" " -V\t\tprint version and exit\n" " -q\t\tbe quiet\n" - " -a\t\tappend records in input order\n" + " -a\t\tappend records in input order (required for custom " + "comparators)\n" " -f file\tread from file instead of stdin\n" " -s name\tload into named subDB\n" " -N\t\tuse NOOVERWRITE on puts\n" -- cgit v1.2.3