update from glibc

diff --git a/lib/obstack.c b/lib/obstack.c
index 1e36c4a0a5c2dbd8cc6436de8c7bb07664e47fe8..1ff4155611884c6db65780490282e2268f091f2a 100644 (file)
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -85,7 +85,7 @@ void (*obstack_alloc_failed_handler) () = print_and_abort;
 #endif
 
 /* Exit value used when `print_and_abort' is used.  */
-#if defined (__STDC__) && __STDC__
+#if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #ifndef EXIT_FAILURE

diff --git a/lib/obstack.h b/lib/obstack.h
index 0e7eb09054660df5374e17181473c05d2a2c02e0..53d25b449d7211458b772ffeab719ae94c6a5c04 100644 (file)
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -107,6 +107,10 @@ Summary:
 #ifndef __OBSTACK_H__
 #define __OBSTACK_H__
 \f
+#ifdef __cplusplus
+extern "C" {
+#endif
+\f
 /* We use subtraction of (char *) 0 instead of casting to int
    because on word-addressable machines a simple cast to int
    may ignore the byte-within-word field of the pointer.  */
@@ -303,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
 
@@ -578,4 +583,8 @@ __extension__                                                               \
 
 #endif /* not __GNUC__ or not __STDC__ */
 
+#ifdef __cplusplus
+}      /* C++ */
+#endif
+
 #endif /* not __OBSTACK_H__ */