diff options
| author | Casey Dahlin <sadmac@google.com> | 2015-12-15 01:09:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-15 01:09:50 +0000 |
| commit | 478259b574b6353437b6d5a03caaa4449add428a (patch) | |
| tree | 1201d005b924e543ea3b01005ed1946b5fac1f88 | |
| parent | 1f62517b3654a3c0e95ea4d5b3664fac8115acdf (diff) | |
| parent | b0343a94fc1a573b1ecb1e92f2fcf1987ad7bbfe (diff) | |
| download | native-478259b574b6353437b6d5a03caaa4449add428a.tar.gz | |
Merge "Don't redefine B_PACK_CHARS"
| -rw-r--r-- | include/binder/IBinder.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/binder/IBinder.h b/include/binder/IBinder.h index 43b654334b..d98d4c5f14 100644 --- a/include/binder/IBinder.h +++ b/include/binder/IBinder.h @@ -23,8 +23,12 @@ #include <utils/Vector.h> +// linux/binder.h already defines this, but we can't just include it from there +// because there are host builds that include this file. +#ifndef B_PACK_CHARS #define B_PACK_CHARS(c1, c2, c3, c4) \ ((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4)) +#endif // B_PACK_CHARS // --------------------------------------------------------------------------- namespace android { |