diff options
Diffstat (limited to 'mozglue')
| -rw-r--r-- | mozglue/build/BionicGlue.cpp | 17 | ||||
| -rw-r--r-- | mozglue/misc/TimeStamp.h | 4 |
2 files changed, 2 insertions, 19 deletions
diff --git a/mozglue/build/BionicGlue.cpp b/mozglue/build/BionicGlue.cpp index 208fcce68..9277f1e76 100644 --- a/mozglue/build/BionicGlue.cpp +++ b/mozglue/build/BionicGlue.cpp @@ -64,22 +64,7 @@ private: static std::vector<AtForkFuncs, SpecialAllocator<AtForkFuncs> > atfork; #endif -#ifdef MOZ_WIDGET_GONK -#include "cpuacct.h" - -#if ANDROID_VERSION < 17 || defined(MOZ_WIDGET_ANDROID) -extern "C" NS_EXPORT int -timer_create(clockid_t, struct sigevent*, timer_t*) -{ - __android_log_print(ANDROID_LOG_ERROR, "BionicGlue", "timer_create not supported!"); - abort(); - return -1; -} -#endif - -#else #define cpuacct_add(x) -#endif #if ANDROID_VERSION < 17 || defined(MOZ_WIDGET_ANDROID) extern "C" NS_EXPORT int @@ -140,7 +125,6 @@ raise(int sig) } /* Flash plugin uses symbols that are not present in Android >= 4.4 */ -#ifndef MOZ_WIDGET_GONK namespace android { namespace VectorImpl { NS_EXPORT void reservedVectorImpl1(void) { } @@ -153,5 +137,4 @@ namespace android { NS_EXPORT void reservedVectorImpl8(void) { } } } -#endif diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h index bec3ae591..6a4f0b810 100644 --- a/mozglue/misc/TimeStamp.h +++ b/mozglue/misc/TimeStamp.h @@ -400,11 +400,11 @@ public: * retrieved by mozilla::TimeStamp. Since we need this for * vsync timestamps, we enable the creation of mozilla::TimeStamps * on platforms that support vsync aligned refresh drivers / compositors - * Verified true as of Jan 31, 2015: B2G and OS X + * Verified true as of Jan 31, 2015: OS X * False on Windows 7 * UNTESTED ON OTHER PLATFORMS */ -#if defined(MOZ_WIDGET_GONK) || defined(XP_DARWIN) +#if defined(XP_DARWIN) static TimeStamp FromSystemTime(int64_t aSystemTime) { static_assert(sizeof(aSystemTime) == sizeof(TimeStampValue), |