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