aboutsummaryrefslogtreecommitdiffstats
path: root/lib/malloc/malloc.c
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>1999-02-19 17:11:39 +0000
committerJari Aalto <jari.aalto@cante.net>2009-09-12 16:46:52 +0000
commitb72432fdcc59300c6fe7c9d6c8a31ad3447933f5 (patch)
treeb9899162338c2ff3fd83a8aef8831cb119e85cd7 /lib/malloc/malloc.c
parentbc4cd23ce958feda898c618215f94d8a4e8f4ffa (diff)
downloadandroid_external_bash-b72432fdcc59300c6fe7c9d6c8a31ad3447933f5.tar.gz
android_external_bash-b72432fdcc59300c6fe7c9d6c8a31ad3447933f5.tar.bz2
android_external_bash-b72432fdcc59300c6fe7c9d6c8a31ad3447933f5.zip
Imported from ../bash-2.03.tar.gz.
Diffstat (limited to 'lib/malloc/malloc.c')
-rw-r--r--lib/malloc/malloc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/malloc/malloc.c b/lib/malloc/malloc.c
index ef57020..e96dd27 100644
--- a/lib/malloc/malloc.c
+++ b/lib/malloc/malloc.c
@@ -184,7 +184,7 @@ struct bucket_stats {
enough room in the block for the new size. Range checking is always
done. */
union mhead {
- double mh_align;
+ bits64_t mh_align; /* 8 */
struct {
char mi_alloc; /* ISALLOC or ISFREE */ /* 1 */
char mi_index; /* index in nextf[] */ /* 1 */
@@ -200,8 +200,8 @@ union mhead {
/* Access free-list pointer of a block.
It is stored at block + sizeof (char *).
- This is not a field in the mhead structure
- because we want sizeof (struct mhead)
+ This is not a field in the minfo structure member of union mhead
+ because we want sizeof (union mhead)
to describe the overhead for when the block is in use,
and we do not want the free-list pointer to count in that. */
@@ -490,6 +490,8 @@ morecore_done:
#else
# if defined (HAVE_POSIX_SIGNALS)
sigprocmask (SIG_SETMASK, &oset, (sigset_t *)NULL);
+# else
+ ; /* nothing to do, but need a null statement before the brace */
# endif
#endif /* HAVE_BSD_SIGNALS */
}