diff options
| author | Hans Boehm <hboehm@google.com> | 2014-08-13 00:19:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-13 00:19:23 +0000 |
| commit | dc1fb9085707d64cae468a4d303f68acdaab6149 (patch) | |
| tree | 93ab8ef61e51af112969e8d10eb3888c876adbf2 /include/binder | |
| parent | f12e678d4b869d7d3d2f3a6622160cfddd76c497 (diff) | |
| parent | a0187a9c83cb042b4cb92dac59214247bb7affcf (diff) | |
| download | frameworks_native-dc1fb9085707d64cae468a4d303f68acdaab6149.zip frameworks_native-dc1fb9085707d64cae468a4d303f68acdaab6149.tar.gz frameworks_native-dc1fb9085707d64cae468a4d303f68acdaab6149.tar.bz2 | |
am a0187a9c: Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""""
* commit 'a0187a9c83cb042b4cb92dac59214247bb7affcf':
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
Diffstat (limited to 'include/binder')
| -rw-r--r-- | include/binder/Binder.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/binder/Binder.h b/include/binder/Binder.h index ba3ac4b..86628a0 100644 --- a/include/binder/Binder.h +++ b/include/binder/Binder.h @@ -17,6 +17,8 @@ #ifndef ANDROID_BINDER_H #define ANDROID_BINDER_H +#include <stdatomic.h> +#include <stdint.h> #include <binder/IBinder.h> // --------------------------------------------------------------------------- @@ -69,7 +71,7 @@ private: class Extras; - Extras* mExtras; + atomic_uintptr_t mExtras; // should be atomic<Extras *> void* mReserved0; }; |