summaryrefslogtreecommitdiffstats
path: root/xpcom/threads
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-22 19:03:00 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:51:25 +0200
commitda15aa0fdf5ec769a0973a00d84f9fa090de0b60 (patch)
treec6f5b8197eac51be855aecdae3b5d97207cdf97e /xpcom/threads
parent867737dd4b650494404a90b8b99ea959f74462ca (diff)
downloadUXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.gz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.lz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.xz
UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.zip
Issue #1053 - Remove android support from XPCOM
Diffstat (limited to 'xpcom/threads')
-rw-r--r--xpcom/threads/ThreadStackHelper.cpp13
-rw-r--r--xpcom/threads/nsThread.h2
2 files changed, 1 insertions, 14 deletions
diff --git a/xpcom/threads/ThreadStackHelper.cpp b/xpcom/threads/ThreadStackHelper.cpp
index 2c0e87986..88a0360ef 100644
--- a/xpcom/threads/ThreadStackHelper.cpp
+++ b/xpcom/threads/ThreadStackHelper.cpp
@@ -46,19 +46,6 @@
#include <pthread.h>
#endif
-#ifdef ANDROID
-#ifndef SYS_gettid
-#define SYS_gettid __NR_gettid
-#endif
-#if defined(__arm__) && !defined(__NR_rt_tgsigqueueinfo)
-// Some NDKs don't define this constant even though the kernel supports it.
-#define __NR_rt_tgsigqueueinfo (__NR_SYSCALL_BASE+363)
-#endif
-#ifndef SYS_rt_tgsigqueueinfo
-#define SYS_rt_tgsigqueueinfo __NR_rt_tgsigqueueinfo
-#endif
-#endif
-
namespace mozilla {
void
diff --git a/xpcom/threads/nsThread.h b/xpcom/threads/nsThread.h
index 037ef1952..c1b3d2618 100644
--- a/xpcom/threads/nsThread.h
+++ b/xpcom/threads/nsThread.h
@@ -264,7 +264,7 @@ protected:
bool mCanInvokeJS;
};
-#if defined(XP_UNIX) && !defined(ANDROID) && !defined(DEBUG) && HAVE_UALARM \
+#if defined(XP_UNIX) && !defined(DEBUG) && HAVE_UALARM \
&& defined(_GNU_SOURCE)
# define MOZ_CANARY