diff options
| author | Ben Cheng <bccheng@google.com> | 2012-12-07 14:37:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-07 14:37:04 -0800 |
| commit | 26f447f5daa745d40ba76b902c5d15d28aaa873f (patch) | |
| tree | 1b96a0dc26883c486142e68d8baab4014c9df7a4 /libcutils | |
| parent | 20eaebeebea46a09957ece46fa0157a06481790f (diff) | |
| parent | 7f692fe6448049dca2795d7d648615a2dc7a500c (diff) | |
| download | system_core-26f447f5daa745d40ba76b902c5d15d28aaa873f.tar.gz system_core-26f447f5daa745d40ba76b902c5d15d28aaa873f.tar.bz2 system_core-26f447f5daa745d40ba76b902c5d15d28aaa873f.zip | |
am 7f692fe6: am 523e21d3: Merge "Fail-proof the inline directives for SMP atomic operations."
* commit '7f692fe6448049dca2795d7d648615a2dc7a500c':
Fail-proof the inline directives for SMP atomic operations.
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/atomic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcutils/atomic.c b/libcutils/atomic.c index f6cd8b0e7..1484ef890 100644 --- a/libcutils/atomic.c +++ b/libcutils/atomic.c @@ -14,6 +14,6 @@ * limitations under the License. */ -#define inline +#define ANDROID_ATOMIC_INLINE #include <cutils/atomic-inline.h> |