fries/quickjs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Android build

Browse source 
dlmalloc has been removed and the NDK now exposes a malloc.h header with
malloc_usable_size exposed, so use that.

Also remove the duplication in js__malloc_usable_size.

Fixes: https://github.com/quickjs-ng/quickjs/issues/304
This commit is contained in:
Saúl Ibarra Corretgé 2024-03-12 09:06:07 +01:00
parent e859eae483
commit 473bd1d531
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cutils.h
View file

@ -38,9 +38,7 @@
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
#include <malloc/malloc.h> #include <malloc/malloc.h>
#elif defined(__ANDROID__) #elif defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__)
#include <dlmalloc.h>
#elif defined(__linux__) || defined(__CYGWIN__)
#include <malloc.h> #include <malloc.h>
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
#include <malloc_np.h> #include <malloc_np.h>
@ -421,9 +419,7 @@ static inline size_t js__malloc_usable_size(const void *ptr)
return malloc_size(ptr); return malloc_size(ptr);
#elif defined(_WIN32) #elif defined(_WIN32)
return _msize((void *)ptr); return _msize((void *)ptr);
#elif defined(__ANDROID__) #elif defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__FreeBSD__)
return dlmalloc_usable_size((void *)ptr);
#elif defined(__linux__) || defined(__FreeBSD__)
return malloc_usable_size((void *)ptr); return malloc_usable_size((void *)ptr);
#else #else
return 0; return 0;

12
quickjs.c
View file

@ -1734,17 +1734,7 @@ static const JSMallocFunctions def_malloc_funcs = {
js_def_malloc, js_def_malloc,
js_def_free, js_def_free,
js_def_realloc, js_def_realloc,
#if defined(__APPLE__) js__malloc_usable_size
malloc_size,
#elif defined(_WIN32)
(size_t (*)(const void *))_msize,
#elif defined(__ANDROID__)
(size_t (*)(const void *))dlmalloc_usable_size,
#elif defined(__linux__) || defined (__CYGWIN__)
(size_t (*)(const void *))malloc_usable_size,
#else
NULL,
#endif
}; };
JSRuntime *JS_NewRuntime(void) JSRuntime *JS_NewRuntime(void)