commit 1d345ecd95be52a7ad0766424402c3cf1726fbee
author Elliott Hughes <enh@google.com> Thu Dec 04 22:45:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 04 22:45:15 2014 +0000
tree c4ce2af7dd9d6be23399166952f6c75e999428e2
parent da630f38d28f24e30eeaf7796ecd8d64e0784428
parent 81c23f3cfe64fc63bf7e5fadf86d08f44d5306df

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

* commit '81c23f3cfe64fc63bf7e5fadf86d08f44d5306df':
  Use __arm__ instead of ARCH_ARM.

libutils/SystemClock.cpp

diff --git a/libutils/SystemClock.cpp b/libutils/SystemClock.cpp
index dbad581..ac3dd98 100644
--- a/libutils/SystemClock.cpp
+++ b/libutils/SystemClock.cpp
@@ -68,7 +68,7 @@
  */
 #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,