commit b6d78b1c13ea107c0f70e9fd90ac73e7383ba47d
author Christopher Wiley <wiley@google.com> Sat Dec 05 00:23:13 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 05 00:23:13 2015 +0000
tree 2317ad6afbfab1d49ea557dc557cf464da686d79
parent 48954a944aee5cff7104b63f183e9523abaa56fc
parent c15af83cfaf25e4f389c7041ecd40f1f972abb46

Merge "libbinder: Don\'t redefine B_PACK_CHARS" am: 7166e7823c
am: a1474da3b5

* commit 'a1474da3b5a521c2f33494b4a83e50841a399c15':
  libbinder: Don't redefine B_PACK_CHARS

include/hwbinder/IBinder.h

diff --git a/include/hwbinder/IBinder.h b/include/hwbinder/IBinder.h
index 43b6543..607c18b 100644
--- a/include/hwbinder/IBinder.h
+++ b/include/hwbinder/IBinder.h
@@ -17,14 +17,17 @@
 #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>
 
-
-#define B_PACK_CHARS(c1, c2, c3, c4) \
-    ((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4))
+#ifndef B_PACK_CHARS
+#error "linux/binder.h no longer defines B_PACK_CHARS"
+#endif
 
 // ---------------------------------------------------------------------------
 namespace android {