diff options
| author | Christopher Wiley <wiley@google.com> | 2015-12-04 16:20:15 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-04 16:20:15 -0800 |
| commit | a1474da3b5a521c2f33494b4a83e50841a399c15 (patch) | |
| tree | cdcd39bf1097be1641af76ab237a24ef8bfa5fbb | |
| parent | 302abd03b6db600c41b353213002ba552b3e0097 (diff) | |
| parent | 7166e7823cedb817f0278f569940aa86f424aa3b (diff) | |
| download | native-a1474da3b5a521c2f33494b4a83e50841a399c15.tar.gz | |
Merge "libbinder: Don\'t redefine B_PACK_CHARS"
am: 7166e7823c
* commit '7166e7823cedb817f0278f569940aa86f424aa3b':
libbinder: Don't redefine B_PACK_CHARS
| -rw-r--r-- | include/binder/IBinder.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/binder/IBinder.h b/include/binder/IBinder.h index 43b654334b..607c18bce8 100644 --- a/include/binder/IBinder.h +++ b/include/binder/IBinder.h @@ -17,14 +17,17 @@ #ifndef ANDROID_IBINDER_H #define ANDROID_IBINDER_H +#include <cstdlib> // Defines types needed for linux/binder.h +#include <linux/binder.h> // Needed for B_PACK_CHARS + #include <utils/Errors.h> #include <utils/RefBase.h> #include <utils/String16.h> #include <utils/Vector.h> - -#define B_PACK_CHARS(c1, c2, c3, c4) \ - ((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4)) +#ifndef B_PACK_CHARS +#error "linux/binder.h no longer defines B_PACK_CHARS" +#endif // --------------------------------------------------------------------------- namespace android { |