Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a496ca authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

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

am: a1474da3

* commit 'a1474da3':
  libbinder: Don't redefine B_PACK_CHARS
parents 6e45fe3c a1474da3
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -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 {