commit 158c7cbf282ca89f082428546c534b59e46c6491
author Bart Sears <bsears@google.com> Sat Dec 05 03:45:09 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 05 03:45:09 2015 +0000
tree c133e54835ba9d887577e076da41ea85e6e709f0
parent b6d78b1c13ea107c0f70e9fd90ac73e7383ba47d
parent be73ed8fe68cf4646a6c473ba304825ef6d015eb

Merge "Revert "libbinder: Don\'t redefine B_PACK_CHARS"" am: 3f46d82d7b
am: 9bb03731ee

* commit '9bb03731ee1f01abbc193a75ea08d632fbb2f81b':
  Revert "libbinder: Don't redefine B_PACK_CHARS"

include/hwbinder/IBinder.h

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