Revert "libbinder: Don't redefine B_PACK_CHARS"
This reverts commit 3eab1b40acbcc2e82b3e90da26706129019eccf9.
Change-Id: Iedc99961c6014029722f814e621970c1732f9092
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 {