diff --git a/submodules/externals/sqlite3/sqlite3.c b/submodules/externals/sqlite3/sqlite3.c index deef46089..e84d74f7c 100644 --- a/submodules/externals/sqlite3/sqlite3.c +++ b/submodules/externals/sqlite3/sqlite3.c @@ -23013,6 +23013,21 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ #include #if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 #include + +#if defined(__ANDROID__) + +/*this block is to workaround a bug introduced by google with its unified headers in NDK 14.*/ + +#include "android/api-level.h" + +# ifdef __ANDROID_API_O__ /*present with unified headers introduced with NDK14*/ +# if __ANDROID_API__ < 21 + /*mmap declaration is missing below api 21 in unified headers, but not in normal headers*/ + extern void* mmap(void*, size_t, int, int, int, off_t); +# endif +# endif +#endif /*defined(ANDROID)*/ + #endif diff --git a/submodules/linphone b/submodules/linphone index d981a246f..f28d968a6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d981a246f896c66ce53db19b626b6647dd529865 +Subproject commit f28d968a67eab65e07e60ef8a8b19621c6401e82