diff options
| author | Andy McFadden <fadden@android.com> | 2010-07-01 11:56:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-01 11:56:13 -0700 |
| commit | 7ae24be753f5d4a2fc00e1c408a6aca5edd17acb (patch) | |
| tree | 2c26bb3a2c2d05400861fe56d867564d680b7b33 /include | |
| parent | 83d11a7ef86047b32dd6488cd277e3ac00b4f347 (diff) | |
| parent | 635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9 (diff) | |
| download | core-7ae24be753f5d4a2fc00e1c408a6aca5edd17acb.tar.gz core-7ae24be753f5d4a2fc00e1c408a6aca5edd17acb.tar.bz2 core-7ae24be753f5d4a2fc00e1c408a6aca5edd17acb.zip | |
am 635dc574: am 57dbb2cb: Merge "Add a HAVE define for pthread_setname_np()." into gingerbread
Merge commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9'
* commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9':
Add a HAVE define for pthread_setname_np().
Diffstat (limited to 'include')
| -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 81f077f43..5e1e031ac 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 /* |