ITS#9017 cleanup Windows off_t

mdb.master3
Howard Chu 5 years ago
parent 9c01725fae
commit 034a7e98a6
  1. 6
      libraries/liblmdb/mdb.c

@ -96,7 +96,7 @@ static NtCloseFunc *NtClose;
# define SSIZE_MAX INT_MAX # define SSIZE_MAX INT_MAX
# endif # endif
#endif #endif
#define MDB_OFF_T LARGE_INTEGER #define MDB_OFF_T int64_t
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -6542,7 +6542,7 @@ mdb_rpage_get(MDB_txn *txn, pgno_t pg0, int numpgs, MDB_page **ret)
pgno_t pgno; pgno_t pgno;
int rc, retries = 1; int rc, retries = 1;
#ifdef _WIN32 #ifdef _WIN32
MDB_OFF_T off; LARGE_INTEGER off;
SIZE_T len; SIZE_T len;
#define SET_OFF(off,val) off.QuadPart = val #define SET_OFF(off,val) off.QuadPart = val
#define MAP(rc,env,addr,len,off) \ #define MAP(rc,env,addr,len,off) \
@ -6551,7 +6551,7 @@ mdb_rpage_get(MDB_txn *txn, pgno_t pg0, int numpgs, MDB_page **ret)
len, &off, &len, ViewUnmap, (env->me_flags & MDB_RDONLY) ? 0 : MEM_RESERVE, PAGE_READONLY); \ len, &off, &len, ViewUnmap, (env->me_flags & MDB_RDONLY) ? 0 : MEM_RESERVE, PAGE_READONLY); \
if (rc) rc = mdb_nt2win32(rc) if (rc) rc = mdb_nt2win32(rc)
#else #else
MDB_OFF_T off; off_t off;
size_t len; size_t len;
#define SET_OFF(off,val) off = val #define SET_OFF(off,val) off = val
#define MAP(rc,env,addr,len,off) \ #define MAP(rc,env,addr,len,off) \

Loading…
Cancel
Save