]> Savannah Git Hosting - gnulib.git/commitdiff
obstack: do not reject malloc-style obstack_chunkfun, obstack_freefun
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 5 Nov 2014 19:41:57 +0000 (11:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 5 Nov 2014 19:42:24 +0000 (11:42 -0800)
Problem reported by Alan Modra in:
http://lists.gnu.org/archive/html/bug-gnulib/2014-11/msg00007.html
* lib/obstack.h (obstack_chunkfun, obstack_freefun):
Always cast the function arg, reverting this part of the previous
change.

ChangeLog
lib/obstack.h

index 3b3af6735ef6958fe76491286cfabdbce1dca87f..7e03d0784ebb55fa09f61d7ab615f94382f0093b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       obstack: do not reject malloc-style obstack_chunkfun, obstack_freefun
+       Problem reported by Alan Modra in:
+       http://lists.gnu.org/archive/html/bug-gnulib/2014-11/msg00007.html
+       * lib/obstack.h (obstack_chunkfun, obstack_freefun):
+       Always cast the function arg, reverting this part of the previous
+       change.
+
 2014-11-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        obstack: avoid potentially-nonportable function casts
index 7b6dee801380a23a679100e63b4b1ac12af5f129..befe1c255fb122e7328964238d72d8da05ee1bd6 100644 (file)
@@ -257,12 +257,10 @@ extern int obstack_exit_failure;
                     _OBSTACK_CAST (void (*) (void *, void *), freefun), arg)
 
 #define obstack_chunkfun(h, newchunkfun)                                     \
-  ((void) ((h)->chunkfun.extra = _OBSTACK_CAST (void *(*) (void *, size_t),   \
-                                                newchunkfun)))
+  ((void) ((h)->chunkfun.extra = (void *(*) (void *, size_t)) (newchunkfun)))
 
 #define obstack_freefun(h, newfreefun)                                       \
-  ((void) ((h)->freefun.extra = _OBSTACK_CAST (void (*) (void *, void *),     \
-                                               newfreefun)))
+  ((void) ((h)->freefun.extra = (void *(*) (void *, void *)) (newfreefun)))
 
 #define obstack_1grow_fast(h, achar) ((void) (*((h)->next_free)++ = (achar)))