author | Daniel Holbert <dholbert@cs.stanford.edu> |
Fri, 19 Jun 2015 10:39:20 -0700 | |
changeset 249788 | bcf7d4b06871a7368083df5c2b082fefa61e3cec |
parent 249787 | edbf66bef7d7061728d2eb290d0e1c3815ce0bef |
child 249789 | ae988833ad6b0de99c25bd00342c333e4f1f365a |
push id | 28936 |
push user | ryanvm@gmail.com |
push date | Fri, 19 Jun 2015 20:34:42 +0000 |
treeherder | mozilla-central@c319f262ce3e [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | BenWa |
bugs | 1176266 |
milestone | 41.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mozglue/misc/TimeStamp_posix.cpp +++ b/mozglue/misc/TimeStamp_posix.cpp @@ -11,16 +11,17 @@ // the smallest unit of time representable by struct timespec. That // doesn't mean that a nanosecond is the resolution of TimeDurations // obtained with this API; see TimeDuration::Resolution; // #include <sys/syscall.h> #include <time.h> #include <unistd.h> +#include <string.h> #if defined(__DragonFly__) || defined(__FreeBSD__) \ || defined(__NetBSD__) || defined(__OpenBSD__) #include <sys/param.h> #include <sys/sysctl.h> #endif #if defined(__DragonFly__) || defined(__FreeBSD__) @@ -200,17 +201,17 @@ TimeStamp::Shutdown() } TimeStamp TimeStamp::Now(bool aHighResolution) { return TimeStamp(ClockTimeNs()); } -#if defined(LINUX) || defined(ANDROID) +#if defined(XP_LINUX) || defined(ANDROID) // Calculates the amount of jiffies that have elapsed since boot and up to the // starttime value of a specific process as found in its /proc/*/stat file. // Returns 0 if an error occurred. static uint64_t JiffiesSinceBoot(const char* aFile) {