diff --git a/include/arch/linux-arm/AndroidConfig.h b/include/arch/linux-arm/AndroidConfig.h index f51ddb1c7..32b702692 100644 --- a/include/arch/linux-arm/AndroidConfig.h +++ b/include/arch/linux-arm/AndroidConfig.h @@ -41,10 +41,17 @@ */ #define HAVE_PTHREADS +/* + * Do we have pthread_setname_np()? + * + * (HAVE_PTHREAD_SETNAME_NP is used by WebKit to enable a function with + * the same name but different parameters, so we can't use that here.) + */ +#define HAVE_ANDROID_PTHREAD_SETNAME_NP + /* * Do we have the futex syscall? */ - #define HAVE_FUTEX /* diff --git a/include/arch/linux-sh/AndroidConfig.h b/include/arch/linux-sh/AndroidConfig.h index 5e939907e..76ae7d71c 100644 --- a/include/arch/linux-sh/AndroidConfig.h +++ b/include/arch/linux-sh/AndroidConfig.h @@ -41,10 +41,17 @@ */ #define HAVE_PTHREADS +/* + * Do we have pthread_setname_np()? + * + * (HAVE_PTHREAD_SETNAME_NP is used by WebKit to enable a function with + * the same name but different parameters, so we can't use that here.) + */ +#define HAVE_ANDROID_PTHREAD_SETNAME_NP + /* * Do we have the futex syscall? */ - #define HAVE_FUTEX /* diff --git a/include/arch/target_linux-x86/AndroidConfig.h b/include/arch/target_linux-x86/AndroidConfig.h index 4db3e72a3..b9800dd57 100644 --- a/include/arch/target_linux-x86/AndroidConfig.h +++ b/include/arch/target_linux-x86/AndroidConfig.h @@ -27,10 +27,17 @@ */ #define HAVE_PTHREADS +/* + * Do we have pthread_setname_np()? + * + * (HAVE_PTHREAD_SETNAME_NP is used by WebKit to enable a function with + * the same name but different parameters, so we can't use that here.) + */ +#define HAVE_ANDROID_PTHREAD_SETNAME_NP + /* * Do we have the futex syscall? */ - #define HAVE_FUTEX /*