diff options
| author | Hans Boehm <hboehm@google.com> | 2014-08-09 01:17:13 +0000 |
|---|---|---|
| committer | Hans Boehm <hboehm@google.com> | 2014-08-09 01:17:13 +0000 |
| commit | f010a05c7e9a23b6083294aff4a8183ab01f686e (patch) | |
| tree | d998772c8017fe2619ac2da95e26d75c1029c4ce /include/binder | |
| parent | 66629e0de532376fa3ef43175ad05eccd21114da (diff) | |
| download | frameworks_native-f010a05c7e9a23b6083294aff4a8183ab01f686e.zip frameworks_native-f010a05c7e9a23b6083294aff4a8183ab01f686e.tar.gz frameworks_native-f010a05c7e9a23b6083294aff4a8183ab01f686e.tar.bz2 | |
Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""
This reverts commit 66629e0de532376fa3ef43175ad05eccd21114da.
Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
Diffstat (limited to 'include/binder')
| -rw-r--r-- | include/binder/Binder.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/binder/Binder.h b/include/binder/Binder.h index 86628a0..ba3ac4b 100644 --- a/include/binder/Binder.h +++ b/include/binder/Binder.h @@ -17,8 +17,6 @@ #ifndef ANDROID_BINDER_H #define ANDROID_BINDER_H -#include <stdatomic.h> -#include <stdint.h> #include <binder/IBinder.h> // --------------------------------------------------------------------------- @@ -71,7 +69,7 @@ private: class Extras; - atomic_uintptr_t mExtras; // should be atomic<Extras *> + Extras* mExtras; void* mReserved0; }; |