diff options
| author | Hans Boehm <hboehm@google.com> | 2014-08-06 22:48:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-06 21:46:54 +0000 |
| commit | 735082ea156d91cf72c241e9134abc22038c8f13 (patch) | |
| tree | d998772c8017fe2619ac2da95e26d75c1029c4ce /include/binder | |
| parent | c11eca81e66892eb62a03b4553055197d122fe5b (diff) | |
| parent | 9dc5c269f74ac76f62515e3d9558e67c6e63067d (diff) | |
| download | frameworks_native-735082ea156d91cf72c241e9134abc22038c8f13.zip frameworks_native-735082ea156d91cf72c241e9134abc22038c8f13.tar.gz frameworks_native-735082ea156d91cf72c241e9134abc22038c8f13.tar.bz2 | |
Merge "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 16f2c4a..ba3ac4b 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; }; |