diff options
Diffstat (limited to 'xpcom/threads')
| -rw-r--r-- | xpcom/threads/ThreadStackHelper.cpp | 13 | ||||
| -rw-r--r-- | xpcom/threads/nsThread.h | 2 |
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 |