am 81c23f3c: Merge "Use __arm__ instead of ARCH_ARM."

* commit '81c23f3cfe64fc63bf7e5fadf86d08f44d5306df':
  Use __arm__ instead of ARCH_ARM.
This commit is contained in:
Elliott Hughes 2014-12-04 22:45:15 +00:00 committed by Android Git Automerger
commit 1d345ecd95
1 changed files with 1 additions and 1 deletions

View File

@ -68,7 +68,7 @@ int64_t elapsedRealtime()
*/
#define DEBUG_TIMESTAMP 0
#if DEBUG_TIMESTAMP && defined(ARCH_ARM)
#if DEBUG_TIMESTAMP && defined(__arm__)
static inline void checkTimeStamps(int64_t timestamp,
int64_t volatile *prevTimestampPtr,
int volatile *prevMethodPtr,