diff options
| author | Andy McFadden <fadden@android.com> | 2010-06-30 14:49:25 -0700 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2010-06-30 22:23:21 -0700 |
| commit | 8e9d5c972e3eda8d1b7b9a62cd6e8a324286cfe9 (patch) | |
| tree | be47a474d4802917b2bd7ad503c4b761693fa60f /include/arch | |
| parent | eb42170e6c8b70f11dca9965785aa04a80290c72 (diff) | |
| download | system_core-8e9d5c972e3eda8d1b7b9a62cd6e8a324286cfe9.tar.gz system_core-8e9d5c972e3eda8d1b7b9a62cd6e8a324286cfe9.tar.bz2 system_core-8e9d5c972e3eda8d1b7b9a62cd6e8a324286cfe9.zip | |
Add a HAVE define for pthread_setname_np().
Due to conflicts with recent WebKit, we need to call it
HAVE_ANDROID_PTHREAD_SETNAME_NP.
https://review.source.android.com/#change,15227 has the original
change, which was reverted after the conflict was found.
Change-Id: I7111960a16505558338756dba91eb50cadb582ff
Diffstat (limited to 'include/arch')
| -rw-r--r-- | include/arch/linux-arm/AndroidConfig.h | 9 | ||||
| -rw-r--r-- | include/arch/linux-sh/AndroidConfig.h | 9 | ||||
| -rw-r--r-- | include/arch/target_linux-x86/AndroidConfig.h | 9 |
3 files changed, 24 insertions, 3 deletions
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 @@ -42,9 +42,16 @@ #define HAVE_PTHREADS /* - * Do we have the futex syscall? + * 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 @@ -42,9 +42,16 @@ #define HAVE_PTHREADS /* - * Do we have the futex syscall? + * 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 @@ -28,9 +28,16 @@ #define HAVE_PTHREADS /* - * Do we have the futex syscall? + * 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 /* |