(obstack_specify_allocation_with_arg, obstack_chunkfun,

obstack_freefun): Fix casts.

diff --git a/malloc/obstack.h b/malloc/obstack.h
index 54c4d51457620a9103d755e06a46cd47a9c6263b..b60828b6aeb13389668afef8f9df9490b76993e1 100644 (file)
--- a/malloc/obstack.h
+++ b/malloc/obstack.h
@@ -307,13 +307,14 @@ extern int obstack_exit_failure;
 
 #define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
   _obstack_begin_1 ((h), (size), (alignment), \
-                   (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun), (arg))
+                   (void *(*) (void *, long)) (chunkfun), \
+                   (void (*) (void *, void *)) (freefun), (arg))
 
 #define obstack_chunkfun(h, newchunkfun) \
-  ((h) -> chunkfun = (struct _obstack_chunk *(*)(long)) (newchunkfun))
+  ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
 
 #define obstack_freefun(h, newfreefun) \
-  ((h) -> freefun = (void (*)(void *)) (newfreefun))
+  ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
 
 #else
 
@@ -583,7 +584,7 @@ __extension__                                                               \
 #endif /* not __GNUC__ or not __STDC__ */
 
 #ifdef __cplusplus
-}
+}      /* C++ */
 #endif
 
 #endif /* not __OBSTACK_H__ */