mirror of https://github.com/microsoft/vcpkg.git
[lmdb] update to 1.0.1 (#53310)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
parent
34a82743a7
commit
9ddbb3455b
|
|
@ -1,89 +0,0 @@
|
|||
diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
|
||||
index 6802cc7..0862916 100644
|
||||
--- a/libraries/liblmdb/mdb.c
|
||||
+++ b/libraries/liblmdb/mdb.c
|
||||
@@ -7213,7 +7213,7 @@ ok:
|
||||
#endif
|
||||
*ret = p;
|
||||
if (enc && env->me_encfunc) {
|
||||
- *enc = (MDB_page *)(id3.mptr + rem * env->me_psize);
|
||||
+ *enc = (MDB_page *)((char *)id3.mptr + rem * env->me_psize);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
@@ -11614,7 +11614,8 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd)
|
||||
#endif
|
||||
#if MDB_RPAGE_CACHE
|
||||
#ifdef _WIN32
|
||||
- LARGE_INTEGER off = 0;
|
||||
+ LARGE_INTEGER off;
|
||||
+ off.QuadPart = 0;
|
||||
#else
|
||||
off_t off = 0;
|
||||
#endif
|
||||
@@ -11678,7 +11679,11 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd)
|
||||
}
|
||||
#if MDB_RPAGE_CACHE
|
||||
if (MDB_REMAPPING(env->me_flags)) {
|
||||
+#ifdef _WIN32
|
||||
+ off.QuadPart = wsize;
|
||||
+#else
|
||||
off = wsize;
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
wsize = w3 - wsize;
|
||||
@@ -11686,7 +11691,11 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd)
|
||||
w2 = (wsize > MAX_WRITE) ? MAX_WRITE : wsize;
|
||||
#if MDB_RPAGE_CACHE
|
||||
if (MDB_REMAPPING(env->me_flags)) {
|
||||
+#ifdef _WIN32
|
||||
+ MAP(rc, env, ptr, w2, off.QuadPart);
|
||||
+#else
|
||||
MAP(rc, env, ptr, w2, off);
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
DO_WRITE(rc, fd, ptr, w2, len);
|
||||
@@ -11704,7 +11713,11 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd)
|
||||
wsize -= len;
|
||||
#if MDB_RPAGE_CACHE
|
||||
if (MDB_REMAPPING(env->me_flags)) {
|
||||
+#ifdef _WIN32
|
||||
+ off.QuadPart += len;
|
||||
+#else
|
||||
off += len;
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
continue;
|
||||
@@ -11946,7 +11959,8 @@ mdb_env_incr_loadfd(MDB_env *env, HANDLE fd)
|
||||
return ENOMEM;
|
||||
|
||||
#ifdef _WIN32
|
||||
- SetFilePointerEx(env->me_fd, 0, NULL, FILE_BEGIN);
|
||||
+ off.QuadPart = 0;
|
||||
+ SetFilePointerEx(env->me_fd, off, NULL, FILE_BEGIN);
|
||||
#else
|
||||
lseek(env->me_fd, 0, SEEK_SET);
|
||||
#endif
|
||||
@@ -12011,15 +12025,16 @@ mdb_env_incr_loadfd(MDB_env *env, HANDLE fd)
|
||||
ptr += rlen;
|
||||
rsize -= rlen;
|
||||
}
|
||||
- off = (pg-prevpg-numprev) * env->me_psize;
|
||||
rsize = numpgs * env->me_psize;
|
||||
- if (off) {
|
||||
#ifdef _WIN32
|
||||
+ off.QuadPart = (pg-prevpg-numprev) * env->me_psize;
|
||||
+ if (off.QuadPart)
|
||||
SetFilePointerEx(env->me_fd, off, NULL, FILE_CURRENT);
|
||||
#else
|
||||
+ off = (pg-prevpg-numprev) * env->me_psize;
|
||||
+ if (off)
|
||||
lseek(env->me_fd, off, SEEK_CUR);
|
||||
#endif
|
||||
- }
|
||||
ptr = pbuf;
|
||||
while (rsize > 0) {
|
||||
w2 = (rsize > MAX_WRITE) ? MAX_WRITE: rsize;
|
||||
|
|
@ -2,11 +2,10 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO LMDB/lmdb
|
||||
REF "LMDB_${VERSION}"
|
||||
SHA512 e51013e4fcd375cacbda19ccd49998b2f4f0b59f6888b91bb6e6cff883ada80451137fd95fb5fb9a46ef4ea294fff75a54a81448af71ac654993b52de62f2374
|
||||
SHA512 902908ca5fa66f8e2064ab44505f8172cd193c88c608a8369cc76e1285e9b36ef4c275f5b8ed21fd1ee31f0d7148a0050945dd0d5ea7cf74c24ada2f7c8d222d
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
getopt-win32.diff
|
||||
msvc.diff
|
||||
)
|
||||
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${SOURCE_PATH}/libraries/liblmdb")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "lmdb",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.1",
|
||||
"description": "LMDB is an extraordinarily fast, memory-efficient database.",
|
||||
"homepage": "https://www.symas.com/mdb",
|
||||
"documentation": "http://www.lmdb.tech/doc/",
|
||||
|
|
|
|||
|
|
@ -6225,7 +6225,7 @@
|
|||
"port-version": 6
|
||||
},
|
||||
"lmdb": {
|
||||
"baseline": "1.0.0",
|
||||
"baseline": "1.0.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"lodepng": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f739ce7cd21c21e1f5220cdf3f2d6ff1c3f48bb0",
|
||||
"version": "1.0.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "56851dcbc2083a9743092224c40eb9b29d0b8933",
|
||||
"version": "1.0.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue