diff options
| author | Bart Sears <bsears@google.com> | 2015-12-05 03:42:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-05 03:42:14 +0000 |
| commit | 9bb03731ee1f01abbc193a75ea08d632fbb2f81b (patch) | |
| tree | ba9bf8de55ea153850de586665fdf57afc282587 | |
| parent | c21980bc12db67c763a18b1abaa3ddd3689b1687 (diff) | |
| parent | 3f46d82d7b8ee0ae6295723311e5c986b649d727 (diff) | |
| download | native-9bb03731ee1f01abbc193a75ea08d632fbb2f81b.tar.gz | |
Merge "Revert "libbinder: Don\'t redefine B_PACK_CHARS""
am: 3f46d82d7b
* commit '3f46d82d7b8ee0ae6295723311e5c986b649d727':
Revert "libbinder: Don't redefine B_PACK_CHARS"
| -rw-r--r-- | include/binder/IBinder.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/binder/IBinder.h b/include/binder/IBinder.h index 607c18bce8..43b654334b 100644 --- a/include/binder/IBinder.h +++ b/include/binder/IBinder.h @@ -17,17 +17,14 @@ #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> -#ifndef B_PACK_CHARS -#error "linux/binder.h no longer defines B_PACK_CHARS" -#endif + +#define B_PACK_CHARS(c1, c2, c3, c4) \ + ((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4)) // --------------------------------------------------------------------------- namespace android { |