Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix compilation with NDK >= 14 (bugs in google's unified headers)

Browse source
This commit is contained in:
Simon Morlat 2017-09-18 21:14:13 +02:00
parent 0029772911
commit a6aacef3a3
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
submodules/externals/sqlite3/sqlite3.c vendored
View file

@ -23013,6 +23013,21 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
#include <errno.h>
#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
#include <sys/mman.h>
#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

2
submodules/linphone

@ -1 +1 @@
Subproject commit d981a246f896c66ce53db19b626b6647dd529865
Subproject commit f28d968a67eab65e07e60ef8a8b19621c6401e82