Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 884239 - Remove the wrapper function of timer_create if ANDROID_VERSION is greater than JB MR1. r=mwu

Browse Source
This commit is contained in:
Shawn Huang 2013-07-19 10:10:00 -04:00
parent 33db89b849
commit 8400c587ff
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozglue/build/BionicGlue.cpp
View File

@ -15,6 +15,7 @@
#define NS_EXPORT __attribute__ ((visibility("default")))
#if ANDROID_VERSION < 17 || defined(MOZ_WIDGET_ANDROID)
/* Android doesn't have pthread_atfork(), so we need to use our own. */
struct AtForkFuncs {
void (*prepare)(void);
@ -59,11 +60,13 @@ private:
};
static std::vector<AtForkFuncs, SpecialAllocator<AtForkFuncs> > atfork;
#endif
#ifdef MOZ_WIDGET_GONK
#include "cpuacct.h"
#define WRAP(x) x
#if ANDROID_VERSION < 17 || defined(MOZ_WIDGET_ANDROID)
extern "C" NS_EXPORT int
timer_create(clockid_t, struct sigevent*, timer_t*)
{
@ -71,12 +74,14 @@ timer_create(clockid_t, struct sigevent*, timer_t*)
abort();
return -1;
}
#endif
#else
#define cpuacct_add(x)
#define WRAP(x) __wrap_##x
#endif
#if ANDROID_VERSION < 17 || defined(MOZ_WIDGET_ANDROID)
extern "C" NS_EXPORT int
WRAP(pthread_atfork)(void (*prepare)(void), void (*parent)(void), void (*child)(void))
{
@ -117,6 +122,7 @@ WRAP(fork)(void)
}
return pid;
}
#endif
extern "C" NS_EXPORT int
WRAP(raise)(int sig)