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

Commit e41e78a1 authored by Casey Dahlin's avatar Casey Dahlin Committed by android-build-merger
Browse files

Merge "Don\'t redefine B_PACK_CHARS" am: 478259b5

am: e9ddb0d0

* commit 'e9ddb0d0':
  Don't redefine B_PACK_CHARS
parents 0bf433e2 e9ddb0d0
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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 {