am e769368d: am c8bd2c2e: am 458076c3: Merge "Fix the ALIGN and ALIGNBYTES macros for LP64."

* commit 'e769368d76ce86e1d166d551436204a5821d0849':
  Fix the ALIGN and ALIGNBYTES macros for LP64.
This commit is contained in:
Elliott Hughes 2013-10-09 09:13:04 -07:00 committed by Android Git Automerger
commit d81a7d9dad

View File

@ -34,8 +34,13 @@
#define MAXPATHLEN PATH_MAX
#define MAXSYMLINKS 8
#define ALIGNBYTES 3
#define ALIGN(p) (((unsigned int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
#if __LP64__
#define ALIGNBYTES 7
#else
#define ALIGNBYTES 3
#endif
#define ALIGN(p) (((unsigned long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
#define powerof2(x) ((((x)-1)&(x))==0)