| commit | 59836bd243bd5fc035b224d3e10abac41ee0ca85 | [log] [tgz] |
|---|---|---|
| author | Alex Ray <aray@google.com> | Tue Dec 04 11:29:51 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 04 11:29:52 2012 -0800 |
| tree | 815beb0d41aab8a090ded9096220d41022d87e98 | |
| parent | 229d2ace9de253e01a486a518301168ebb695b96 [diff] | |
| parent | 448f76a1c4eb78661b5ac68013e8a2348c92df63 [diff] |
Merge "cutils: trace: use ANDROID_SMP to switch atomics"
diff --git a/include/cutils/trace.h b/include/cutils/trace.h index 3869662..1db3903 100644 --- a/include/cutils/trace.h +++ b/include/cutils/trace.h
@@ -21,9 +21,14 @@ #include <sys/types.h> #include <stdint.h> #include <unistd.h> -#include <cutils/atomic.h> #include <cutils/compiler.h> +#ifdef ANDROID_SMP +#include <cutils/atomic-inline.h> +#else +#include <cutils/atomic.h> +#endif + __BEGIN_DECLS /**