Happy New Year

[openldap] / libraries / liblmdb / mdb_load.c

diff --git a/libraries/liblmdb/mdb_load.c b/libraries/liblmdb/mdb_load.c
index d2f0968188a3b9258a6bbb62a4fbc1b522b1a38c..27aee4029000e9b1555c680e23c7f09910378648 100644 (file)
--- a/libraries/liblmdb/mdb_load.c
+++ b/libraries/liblmdb/mdb_load.c
@@ -1,6 +1,6 @@
 /* mdb_load.c - memory-mapped database load tool */
 /*
- * Copyright 2011-2015 Howard Chu, Symas Corp.
+ * Copyright 2011-2016 Howard Chu, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,15 @@ static MDB_val kbuf, dbuf;
 #else
 #define Z      "z"
 #endif
+#ifdef MDB_VL32
+#ifdef _WIN32
+#define        Y       "I64"
+#else
+#define        Y       "ll"
+#endif
+#else
+#define Y      Z
+#endif
 
 #define STRLENOF(s)    (sizeof(s)-1)
 
@@ -112,7 +121,7 @@ static void readhdr(void)
                        int i;
                        ptr = memchr(dbuf.mv_data, '\n', dbuf.mv_size);
                        if (ptr) *ptr = '\0';
-                       i = sscanf((char *)dbuf.mv_data+STRLENOF("mapsize="), "%" Z "u", &info.me_mapsize);
+                       i = sscanf((char *)dbuf.mv_data+STRLENOF("mapsize="), "%" Y "u", &info.me_mapsize);
                        if (i != 1) {
                                fprintf(stderr, "%s: line %" Z "d: invalid mapsize %s\n",
                                        prog, lineno, (char *)dbuf.mv_data+STRLENOF("mapsize="));