diff options
| author | Hans Boehm <hboehm@google.com> | 2014-08-06 21:21:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 21:21:05 +0000 |
| commit | 52bfb70cf86bf5839cf32b9d985f413b9e127258 (patch) | |
| tree | 9d41ff31ba3340c191c568e12d0e9d62ca9bd2f0 /include/binder | |
| parent | 9f6c3a8e01e3ce879bb50229787f18c9e8a31936 (diff) | |
| parent | c11eca81e66892eb62a03b4553055197d122fe5b (diff) | |
| download | frameworks_native-52bfb70cf86bf5839cf32b9d985f413b9e127258.zip frameworks_native-52bfb70cf86bf5839cf32b9d985f413b9e127258.tar.gz frameworks_native-52bfb70cf86bf5839cf32b9d985f413b9e127258.tar.bz2 | |
am c11eca81: Merge "Remove incorrect android_atomic_...64 use."
* commit 'c11eca81e66892eb62a03b4553055197d122fe5b':
Remove incorrect android_atomic_...64 use.
Diffstat (limited to 'include/binder')
| -rw-r--r-- | include/binder/Binder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/binder/Binder.h b/include/binder/Binder.h index ba3ac4b..16f2c4a 100644 --- a/include/binder/Binder.h +++ b/include/binder/Binder.h @@ -17,6 +17,7 @@ #ifndef ANDROID_BINDER_H #define ANDROID_BINDER_H +#include <stdatomic.h> #include <binder/IBinder.h> // --------------------------------------------------------------------------- @@ -69,7 +70,7 @@ private: class Extras; - Extras* mExtras; + atomic_uintptr_t mExtras; // should be atomic<Extras *> void* mReserved0; }; |