commit 478259b574b6353437b6d5a03caaa4449add428a
author Casey Dahlin <sadmac@google.com> Tue Dec 15 01:09:50 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 15 01:09:50 2015 +0000
tree 1201d005b924e543ea3b01005ed1946b5fac1f88
parent 1f62517b3654a3c0e95ea4d5b3664fac8115acdf
parent b0343a94fc1a573b1ecb1e92f2fcf1987ad7bbfe

Merge "Don't redefine B_PACK_CHARS"

include/binder/IBinder.h

diff --git a/include/binder/IBinder.h b/include/binder/IBinder.h
index 43b6543..d98d4c5 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 {