mirrors/mimalloc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #227 from devnexen/android_build_fix

Browse Source 
Android build fix proposal.
This commit is contained in:
Daan 2020-04-15 11:23:04 -07:00 committed by GitHub
commit ea558cadba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -146,10 +146,12 @@ endif()
if(WIN32) if(WIN32)
list(APPEND mi_libraries psapi shell32 user32 bcrypt) list(APPEND mi_libraries psapi shell32 user32 bcrypt)
else() else()
list(APPEND mi_libraries pthread) if(NOT ${CMAKE_C_COMPILER} MATCHES "android")
find_library(LIBRT rt) list(APPEND mi_libraries pthread)
if(LIBRT) find_library(LIBRT rt)
list(APPEND mi_libraries ${LIBRT}) if(LIBRT)
list(APPEND mi_libraries ${LIBRT})
endif()
endif() endif()
endif() endif()

4
src/alloc-override.c
View File

@ -165,7 +165,11 @@ extern "C" {
void* reallocf(void* p, size_t newsize) MI_FORWARD2(mi_reallocf,p,newsize); void* reallocf(void* p, size_t newsize) MI_FORWARD2(mi_reallocf,p,newsize);
size_t malloc_size(void* p) MI_FORWARD1(mi_usable_size,p); size_t malloc_size(void* p) MI_FORWARD1(mi_usable_size,p);
#if !defined(__ANDROID__)
size_t malloc_usable_size(void *p) MI_FORWARD1(mi_usable_size,p); size_t malloc_usable_size(void *p) MI_FORWARD1(mi_usable_size,p);
#else
size_t malloc_usable_size(const void *p) MI_FORWARD1(mi_usable_size,p);
#endif
void cfree(void* p) MI_FORWARD0(mi_free, p); void cfree(void* p) MI_FORWARD0(mi_free, p);
// no forwarding here due to aliasing/name mangling issues // no forwarding here due to aliasing/name mangling issues