ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-12-30 03:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: fix and check width of off_t for Android.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-04-19 20:00:29 +03:00
parent 682ff99f1c
commit eb8bc865d1
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/internals.h
View File

@ -47,7 +47,8 @@
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* Should be defined before any includes */ /* Should be defined before any includes */
#ifndef _FILE_OFFSET_BITS #if !defined(_FILE_OFFSET_BITS) && !defined(__ANDROID_API__) && \
!defined(ANDROID)
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#endif #endif

7
src/lck-posix.c
View File

@ -180,6 +180,13 @@ __cold static void choice_fcntl() {
static int lck_op(const mdbx_filehandle_t fd, int cmd, const int lck, static int lck_op(const mdbx_filehandle_t fd, int cmd, const int lck,
const off_t offset, off_t len) { const off_t offset, off_t len) {
STATIC_ASSERT(sizeof(off_t) >= sizeof(void *) &&
sizeof(off_t) >= sizeof(size_t));
#ifdef __ANDROID_API__
STATIC_ASSERT_MSG((sizeof(off_t) * 8 == MDBX_WORDBITS),
"The bitness of system `off_t` type is mismatch. Please "
"fix build and/or NDK configuration.");
#endif /* Android */
mdbx_jitter4testing(true); mdbx_jitter4testing(true);
assert(offset >= 0 && len > 0); assert(offset >= 0 && len > 0);
assert((uint64_t)offset < (uint64_t)INT64_MAX && assert((uint64_t)offset < (uint64_t)INT64_MAX &&

8
src/osal.h
View File

@ -332,6 +332,14 @@ typedef pthread_mutex_t mdbx_fastmutex_t;
#define MDBX_WORDBITS 32 #define MDBX_WORDBITS 32
#endif /* MDBX_WORDBITS */ #endif /* MDBX_WORDBITS */
#if defined(__ANDROID_API__) || defined(ANDROID)
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS != MDBX_WORDBITS
#error "_FILE_OFFSET_BITS != MDBX_WORDBITS" (_FILE_OFFSET_BITS != MDBX_WORDBITS)
#elif defined(__FILE_OFFSET_BITS) && __FILE_OFFSET_BITS != MDBX_WORDBITS
#error "__FILE_OFFSET_BITS != MDBX_WORDBITS" (__FILE_OFFSET_BITS != MDBX_WORDBITS)
#endif
#endif /* Android */
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* Compiler's includes for builtins/intrinsics */ /* Compiler's includes for builtins/intrinsics */