diff options
| author | Hans Boehm <hboehm@google.com> | 2014-08-08 14:19:14 -0700 |
|---|---|---|
| committer | Hans Boehm <hboehm@google.com> | 2014-08-08 17:14:30 -0700 |
| commit | 66629e0de532376fa3ef43175ad05eccd21114da (patch) | |
| tree | b1a4fe410fa86269c9e05ecb193091d178e2b636 /include/binder | |
| parent | 735082ea156d91cf72c241e9134abc22038c8f13 (diff) | |
| download | frameworks_native-66629e0de532376fa3ef43175ad05eccd21114da.tar.gz frameworks_native-66629e0de532376fa3ef43175ad05eccd21114da.tar.bz2 frameworks_native-66629e0de532376fa3ef43175ad05eccd21114da.zip | |
Revert "Revert "Remove incorrect android_atomic_...64 use.""
This reverts commit 9dc5c269f74ac76f62515e3d9558e67c6e63067d.
Adds a stdint.h include in case stdatomic.h stops including that.
Change-Id: If3dd1db1f1132c0f2dc1efb0a44617d3f36d7cfb
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 ba3ac4b99..86628a03d 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; }; |