Merge "Add a HAVE define for pthread_setname_np()." into gingerbread

yoannsculo · Jul 1, 2010 · 57dbb2c · 57dbb2c
2 parents cc4d11c + 8e9d5c9
commit 57dbb2c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
 
 /*