From e23e5195869443e8e4d1fabe1275d588c1356ff7 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Fri, 19 Jun 2015 10:39:20 -0700 Subject: [PATCH] Bug 1176266: In TimeStamp_posix.cpp, check for XP_LINUX instead of LINUX, and add missing #include, to allow strrchr usage. r=BenWa Landing on a CLOSED TREE with RyanVM's permission. --- mozglue/misc/TimeStamp_posix.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mozglue/misc/TimeStamp_posix.cpp b/mozglue/misc/TimeStamp_posix.cpp index e9c4620d6b5e..9126b5678c59 100644 --- a/mozglue/misc/TimeStamp_posix.cpp +++ b/mozglue/misc/TimeStamp_posix.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #if defined(__DragonFly__) || defined(__FreeBSD__) \ || defined(__NetBSD__) || defined(__OpenBSD__) @@ -205,7 +206,7 @@ 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.