diff options
| author | Andy McFadden <fadden@android.com> | 2010-07-01 09:05:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-01 09:05:51 -0700 |
| commit | 57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6 (patch) | |
| tree | 0cb479fb3215bc7e7ac2c79fa4cf350e17a9d8a5 /include | |
| parent | cc4d11c245d5b514ba758cc095a59cd481c92cae (diff) | |
| parent | 8e9d5c972e3eda8d1b7b9a62cd6e8a324286cfe9 (diff) | |
| download | system_core-57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6.zip system_core-57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6.tar.gz system_core-57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6.tar.bz2 | |
Merge "Add a HAVE define for pthread_setname_np()." into gingerbread
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 f51ddb1..32b7026 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 5e93990..76ae7d7 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 4db3e72..b9800dd 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 /* |