Mercurial > hg > octave-lyh > gnulib-hg
changeset 4256:8985ae624e3d
Merge changes from Coreutils.
(obstack_object_size): Declare temporary, __o, to be const,
in order to avoid warnings.
(obstack_room): Likewise.
(obstack_empty_p): Likewise.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Fri, 14 Mar 2003 09:59:32 +0000 |
parents | fe0f8778e46d |
children | 3f4c98927276 |
files | lib/ChangeLog lib/obstack.h |
diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,11 @@ +2003-03-14 Jim Meyering <jim@meyering.net> + + Merge changes from Coreutils. + * obstack.h (obstack_object_size): Declare temporary, __o, + to be const, in order to avoid warnings. + (obstack_room): Likewise. + (obstack_empty_p): Likewise. + 2003-03-13 Paul Eggert <eggert@twinsun.com> Merge changes from Bison.
--- a/lib/obstack.h +++ b/lib/obstack.h @@ -372,12 +372,12 @@ # define obstack_object_size(OBSTACK) \ __extension__ \ - ({ struct obstack *__o = (OBSTACK); \ + ({ struct obstack const *__o = (OBSTACK); \ (unsigned) (__o->next_free - __o->object_base); }) # define obstack_room(OBSTACK) \ __extension__ \ - ({ struct obstack *__o = (OBSTACK); \ + ({ struct obstack const *__o = (OBSTACK); \ (unsigned) (__o->chunk_limit - __o->next_free); }) # define obstack_make_room(OBSTACK,length) \ @@ -390,7 +390,7 @@ # define obstack_empty_p(OBSTACK) \ __extension__ \ - ({ struct obstack *__o = (OBSTACK); \ + ({ struct obstack const *__o = (OBSTACK); \ (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); }) # define obstack_grow(OBSTACK,where,length) \