diff options
author | John Grossman <johngro@google.com> | 2012-02-16 14:57:54 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-16 14:57:54 -0800 |
commit | 27526f236a32f08041b7aaa1bed2d9b7d3f81dc7 (patch) | |
tree | 7b60bb2f0102da2660ffb3fd72fd20a77087798d | |
parent | 7729a8c48b8ed2201706d3b3a805d26e2aace8e1 (diff) | |
parent | b8525e9a76d63a2dc26c87577940a058e70e3dd5 (diff) | |
download | frameworks_base-27526f236a32f08041b7aaa1bed2d9b7d3f81dc7.zip frameworks_base-27526f236a32f08041b7aaa1bed2d9b7d3f81dc7.tar.gz frameworks_base-27526f236a32f08041b7aaa1bed2d9b7d3f81dc7.tar.bz2 |
Merge "Fix the build."
-rw-r--r-- | services/common_time/common_time_server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/common_time/common_time_server.cpp b/services/common_time/common_time_server.cpp index 4af73b5..4db516a 100644 --- a/services/common_time/common_time_server.cpp +++ b/services/common_time/common_time_server.cpp @@ -50,7 +50,7 @@ #include "clock_recovery.h" #include "common_clock.h" -using std::numeric_limits; +#define MAX_INT ((int)0x7FFFFFFF) namespace android { @@ -1335,8 +1335,8 @@ int CommonTimeServer::TimeoutHelper::msecTillTimeout() { uint64_t deltaMsec = (((mEndTime - now) + 999999) / 1000000); - if (deltaMsec > static_cast<uint64_t>(std::numeric_limits<int>::max())) - return std::numeric_limits<int>::max(); + if (deltaMsec > static_cast<uint64_t>(MAX_INT)) + return MAX_INT; return static_cast<int>(deltaMsec); } |