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

Commit 3eab1b40 authored by Christopher Wiley's avatar Christopher Wiley
Browse files

libbinder: Don't redefine B_PACK_CHARS 

This macro is defined in linux/binder.h which is *sometimes* included
before binder/IBinder.h depending on codepath.

Bug: 25868260
Test: Compiles

Change-Id: Ied1e6658936668c16cbdacab3a3205107c907655
parent 823fa55a

include/binder/IBinder.h

+6 −3
Original line number Original line Diff line number Diff line
@@ -17,14 +17,17 @@ 
#ifndef ANDROID_IBINDER_H

#ifndef ANDROID_IBINDER_H

#define 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/Errors.h>

#include <utils/RefBase.h>

#include <utils/RefBase.h>

#include <utils/String16.h>

#include <utils/String16.h>

#include <utils/Vector.h>

#include <utils/Vector.h>







#ifndef B_PACK_CHARS

#define B_PACK_CHARS(c1, c2, c3, c4) \

#error "linux/binder.h no longer defines B_PACK_CHARS"

    ((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4))

#endif





// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------

namespace android {

namespace android {