Moved obstack_free workaround to gnulib.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index aa3acf6fdb2bf2e4b0822e98d75aca78b66b99f6..bf5f164f9230b4babcaf1680f54b9499f4863e26 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-23  Bruno Haible  <bruno@clisp.org>
+
+       Moved last change to gnulib.
+       * lib/obstack.h.diff: Undo last change.
+       * lib/obstack.c.diff: Remove file.
+       * Makefile.am (EXTRA_DIST): Remove it.
+
 2006-10-20  Bruno Haible  <bruno@clisp.org>
 
        * lib/obstack.h.diff: Use _obstack_free instead of obstack_free, but

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 827f0c8c67ee707ab151c28563f9766678228fd0..8aad33860c2032b7c241904de168f36ca0002ee8 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -51,7 +51,6 @@ lib/hash.c \
 lib/hash.h \
 lib/javacomp.c.diff \
 lib/linebreak.c.diff \
-lib/obstack.c.diff \
 lib/obstack.h.diff \
 lib/progname.h.diff \
 lib/propername.c \

diff --git a/gnulib-local/lib/obstack.c.diff b/gnulib-local/lib/obstack.c.diff
deleted file mode 100644 (file)
index d62f2b9..0000000
--- a/gnulib-local/lib/obstack.c.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-*** obstack.c  2006-09-19 00:51:16.000000000 +0200
---- obstack.c  2006-10-21 02:57:17.000000000 +0200
-***************
-*** 342,348 ****
-  # undef obstack_free
-  
-  void
-! obstack_free (struct obstack *h, void *obj)
-  {
-    register struct _obstack_chunk *lp;        /* below addr of any objects in this chunk */
-    register struct _obstack_chunk *plp;       /* point to previous chunk if any */
---- 342,348 ----
-  # undef obstack_free
-  
-  void
-! _obstack_free (struct obstack *h, void *obj)
-  {
-    register struct _obstack_chunk *lp;        /* below addr of any objects in this chunk */
-    register struct _obstack_chunk *plp;       /* point to previous chunk if any */
-***************
-*** 372,377 ****
---- 372,378 ----
-  }
-  
-  # ifdef _LIBC
-+ #  undef _obstack_free
-  /* Older versions of libc used a function _obstack_free intended to be
-     called by non-GCC compilers.  */
-  strong_alias (obstack_free, _obstack_free)

diff --git a/gnulib-local/lib/obstack.h.diff b/gnulib-local/lib/obstack.h.diff
index 4808fb9e3a1701ca669c0f15f2f9820ddb61c6a0..e64e1db0465e9bf2ef7ad111b5a8b6f8ec350bd8 100644 (file)
--- a/gnulib-local/lib/obstack.h.diff
+++ b/gnulib-local/lib/obstack.h.diff
@@ -1,28 +1,6 @@
 *** obstack.h  2005-10-15 01:23:50.000000000 +0200
 --- obstack.h  2006-07-22 17:48:51.000000000 +0200
 ***************
-*** 186,192 ****
-                            void (*) (void *, void *), void *);
-  extern int _obstack_memory_used (struct obstack *);
-  
-! void obstack_free (struct obstack *obstack, void *block);
-  
-  \f
-  /* Error handler called when `obstack_chunk_alloc' failed to allocate
---- 186,197 ----
-                            void (*) (void *, void *), void *);
-  extern int _obstack_memory_used (struct obstack *);
-  
-! /* The default name of the function for freeing a chunk is 'obstack_free',
-!    but gnulib users can override this by defining '_obstack_free'.  */
-! #ifndef _obstack_free
-! # define _obstack_free obstack_free
-! #endif
-! void _obstack_free (struct obstack *obstack, void *block);
-  
-  \f
-  /* Error handler called when `obstack_chunk_alloc' failed to allocate
-***************
 *** 193,202 ****
      more memory.  This can be set to a user defined function which
      should either abort gracefully or use longjump - but shouldn't
@@ -45,37 +23,3 @@
   \f
   /* Pointer to beginning of object being allocated or to be allocated next.
      Note that this might not be the final address of the object
-***************
-*** 399,405 ****
-     void *__obj = (OBJ);                                                      \
-     if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
-       __o->next_free = __o->object_base = (char *)__obj;                      \
-!    else (obstack_free) (__o, __obj); })
-  \f
-  #else /* not __GNUC__ or not __STDC__ */
-  
---- 404,410 ----
-     void *__obj = (OBJ);                                                      \
-     if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
-       __o->next_free = __o->object_base = (char *)__obj;                      \
-!    else (_obstack_free) (__o, __obj); })
-  \f
-  #else /* not __GNUC__ or not __STDC__ */
-  
-***************
-*** 497,503 ****
-      && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))  \
-     ? (int) ((h)->next_free = (h)->object_base                                \
-           = (h)->temp.tempint + (char *) (h)->chunk)                  \
-!    : (((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
-  
-  #endif /* not __GNUC__ or not __STDC__ */
-  
---- 502,508 ----
-      && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))  \
-     ? (int) ((h)->next_free = (h)->object_base                                \
-           = (h)->temp.tempint + (char *) (h)->chunk)                  \
-!    : (((_obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
-  
-  #endif /* not __GNUC__ or not __STDC__ */
-