diff options
| author | 2015-12-14 17:46:50 -0800 | |
|---|---|---|
| committer | 2015-12-14 17:46:50 -0800 | |
| commit | e9ddb0d00d935ed64a78bc212197ca84b090be13 (patch) | |
| tree | e3149dcfdfdb5ccdc11e40b665cf08e12147e284 | |
| parent | 32a59625e0a70eb38648320ddde84e6c91cc9cef (diff) | |
| parent | 478259b574b6353437b6d5a03caaa4449add428a (diff) | |
Merge "Don\'t redefine B_PACK_CHARS"
am: 478259b574
* commit '478259b574b6353437b6d5a03caaa4449add428a':
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 { |