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

* commit '74438bb22505b55ec72224932ae9982fbf9b4b65':
  bionic: add macro protection for MALLOC_ALIGNMENT
This commit is contained in:
Elliott Hughes 2012-08-16 14:23:56 -07:00 committed by Android Git Automerger
commit 820ad4283d

View File

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