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.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index bca7285ce1497ecd1ce6666b3030ddb38a3cb66b..3d7a7a33331097daebacea5fc102da004a199f7e 100644 (file)
--- 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.

diff --git a/lib/obstack.h b/lib/obstack.h
index 7a0ee1128c04cbec97b17b837e9c80eaedda58b4..c0fc9ac641d4c8ee14070939012799b3ddbead2f 100644 (file)
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -372,12 +372,12 @@ extern int obstack_exit_failure;
 
 # 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 @@ __extension__                                                               \
 
 # 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)                            \