am ca82e1f3: am 820ad428: am 74438bb2: am 449d4634: Merge "bionic: add macro protection for MALLOC_ALIGNMENT"

* commit 'ca82e1f3d17b57b1d5bbf0527cae58be1861e9ae':
  bionic: add macro protection for MALLOC_ALIGNMENT
This commit is contained in:
Elliott Hughes 2012-08-16 14:28:52 -07:00 committed by Android Git Automerger
commit 0a14d9f5c8

View File

@ -66,7 +66,9 @@ extern HashTable gHashTable;
// stack trace functions // stack trace functions
// ============================================================================= // =============================================================================
#define MALLOC_ALIGNMENT 8 #ifndef MALLOC_ALIGNMENT
#define MALLOC_ALIGNMENT ((size_t)8U)
#endif
#define GUARD 0x48151642 #define GUARD 0x48151642
#define DEBUG 0 #define DEBUG 0