Merge "Don\'t redefine B_PACK_CHARS" am: 478259b574
am: e9ddb0d00d
* commit 'e9ddb0d00d935ed64a78bc212197ca84b090be13':
Don't redefine B_PACK_CHARS
diff --git a/include/hwbinder/IBinder.h b/include/hwbinder/IBinder.h
index 97f1fc2..5f1e87c 100644
--- a/include/hwbinder/IBinder.h
+++ b/include/hwbinder/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 {