summaryrefslogtreecommitdiff
path: root/pthread_support.c
diff options
context:
space:
mode:
authorivmai <ivmai>2011-04-24 15:09:21 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:58 +0200
commit6b733bad5f8e5c496333ab85774a532ca5b73349 (patch)
treeaa6e3474fa1a4ce487f8bac0cb83039e7c831837 /pthread_support.c
parentc1cac9e179a5ea2e7cbb8b9b71a1ea46ebd3b3da (diff)
2011-04-24 Ivan Maidanski <ivmai@mail.ru>
* pthread_support.c (GC_get_nprocs): Don't define for Android. * pthread_support.c (GC_dummy_thread_local): Don't test GC_LINUX_THREADS. * include/gc_config_macros.h (GC_ADD_CALLER, GC_RETURN_ADDR): Define for Android.
Diffstat (limited to 'pthread_support.c')
-rw-r--r--pthread_support.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pthread_support.c b/pthread_support.c
index d9c3792..2feeac3 100644
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -707,7 +707,7 @@ STATIC void GC_remove_all_threads_but_me(void)
}
#endif /* IA64 */
-#if defined(GC_LINUX_THREADS) && !defined(NACL)
+#if defined(GC_LINUX_THREADS) && !defined(PLATFORM_ANDROID) && !defined(NACL)
/* Return the number of processors. */
STATIC int GC_get_nprocs(void)
{
@@ -883,7 +883,7 @@ STATIC void GC_fork_child_proc(void)
}
#endif /* GC_DARWIN_THREADS || ... */
-#if defined(GC_LINUX_THREADS) && defined(INCLUDE_LINUX_THREAD_DESCR)
+#ifdef INCLUDE_LINUX_THREAD_DESCR
__thread int GC_dummy_thread_local;
#endif