# HG changeset patch # User Paul Eggert # Date 1092114989 0 # Node ID 663a1b941e5141916137b2db1245293250f45877 # Parent 43b6cc039c4910bd9a1d6fa13f727efc0d144172 (obstack_empty_p): Don't assume that chunk->contents is suitably aligned. diff --git a/lib/obstack.h b/lib/obstack.h --- a/lib/obstack.h +++ b/lib/obstack.h @@ -287,7 +287,10 @@ # define obstack_empty_p(OBSTACK) \ __extension__ \ ({ struct obstack const *__o = (OBSTACK); \ - (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); }) + (__o->chunk->prev == 0 \ + && __o->next_free == __PTR_ALIGN ((char *) __o->chunk, \ + __o->chunk->contents, \ + __o->alignment_mask)); }) # define obstack_grow(OBSTACK,where,length) \ __extension__ \ @@ -411,7 +414,10 @@ (unsigned) ((h)->chunk_limit - (h)->next_free) # define obstack_empty_p(h) \ - ((h)->chunk->prev == 0 && (h)->next_free - (h)->chunk->contents == 0) + ((h)->chunk->prev == 0 \ + && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk, \ + (h)->chunk->contents, \ + (h)->alignment_mask)) /* Note that the call to _obstack_newchunk is enclosed in (..., 0) so that we can avoid having void expressions