diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 19:40:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 19:40:16 +0000 |
| commit | ba96de5f65101e8aa04f36c028551dcf08211eae (patch) | |
| tree | e6fec479b8c078aad3ca7bee51a75e9122cae3a7 /include | |
| parent | 33aacf1963dd1914c0ff94c4ddd05f729cdba3b6 (diff) | |
| parent | 3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669 (diff) | |
| download | system_core-ba96de5f65101e8aa04f36c028551dcf08211eae.zip system_core-ba96de5f65101e8aa04f36c028551dcf08211eae.tar.gz system_core-ba96de5f65101e8aa04f36c028551dcf08211eae.tar.bz2 | |
am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."
* commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669':
Remove the error-prone TARGET_CPU_SMP from system/core.
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/aref.h | 4 | ||||
| -rw-r--r-- | include/cutils/trace.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/cutils/aref.h b/include/cutils/aref.h index 460ac02..e40dc70 100644 --- a/include/cutils/aref.h +++ b/include/cutils/aref.h @@ -20,11 +20,7 @@ #include <stddef.h> #include <sys/cdefs.h> -#ifdef ANDROID_SMP #include <cutils/atomic-inline.h> -#else -#include <cutils/atomic.h> -#endif __BEGIN_DECLS diff --git a/include/cutils/trace.h b/include/cutils/trace.h index c863afd..6ca8293 100644 --- a/include/cutils/trace.h +++ b/include/cutils/trace.h @@ -26,11 +26,7 @@ #include <unistd.h> #include <cutils/compiler.h> -#ifdef ANDROID_SMP #include <cutils/atomic-inline.h> -#else -#include <cutils/atomic.h> -#endif __BEGIN_DECLS |