diff options
author | Vladimir Marko <vmarko@google.com> | 2015-05-26 19:57:30 +0100 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2015-05-26 20:13:11 +0100 |
commit | f2383d6b754a8fa23617149a008aa2ab9fcf0adf (patch) | |
tree | a6faec6d97aae2c03c628dbe9d33133aa0ad3525 /runtime | |
parent | 41b175aba41c9365a1c53b8a1afbd17129c87c14 (diff) | |
download | art-f2383d6b754a8fa23617149a008aa2ab9fcf0adf.tar.gz art-f2383d6b754a8fa23617149a008aa2ab9fcf0adf.tar.bz2 art-f2383d6b754a8fa23617149a008aa2ab9fcf0adf.zip |
Fix mac build: include <sys/time.h> in time_utils.cc .
Required for gettimeofday(). Not needed in utils.cc .
Bug: 13925192
(cherry picked from commit ce39200492e2715a94d96fbd39fa42b46115c255)
Change-Id: If40694965b84605819cac11a7937821aa74db82b
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/base/time_utils.cc | 4 | ||||
-rw-r--r-- | runtime/utils.cc | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/runtime/base/time_utils.cc b/runtime/base/time_utils.cc index 29b849e6ce..48b0a090ce 100644 --- a/runtime/base/time_utils.cc +++ b/runtime/base/time_utils.cc @@ -22,6 +22,10 @@ #include "base/logging.h" #include "base/stringprintf.h" +#if defined(__APPLE__) +#include <sys/time.h> +#endif + namespace art { std::string PrettyDuration(uint64_t nano_duration, size_t max_fraction_digits) { diff --git a/runtime/utils.cc b/runtime/utils.cc index fabf9bdca5..2671b46bad 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -42,7 +42,6 @@ #if defined(__APPLE__) #include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED #include <sys/syscall.h> -#include <sys/time.h> #endif #include <backtrace/Backtrace.h> // For DumpNativeStack. |