restore #ifdef __cplusplus around demangler prototypes.

Restore comment that was lost.

2 files changed, 9 insertions, 1 deletions

diff --git a/gnu/lib/libiberty/include/demangle.h b/gnu/lib/libiberty/include/demangle.h
index 21e9dd33820..bff266931c8 100644
--- a/gnu/lib/libiberty/include/demangle.h
+++ b/gnu/lib/libiberty/include/demangle.h
@@ -23,6 +23,10 @@
 
 #include "ansidecl.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /* Options passed to cplus_demangle (in 2nd parameter). */
 
 #define DMGL_NO_OPTS	 0		/* For readability... */
@@ -160,4 +164,8 @@ enum gnu_v3_dtor_kinds {
 extern enum gnu_v3_dtor_kinds
 	is_gnu_v3_mangled_dtor PARAMS ((const char *name));
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif	/* DEMANGLE_H */
diff --git a/gnu/lib/libiberty/include/libiberty.h b/gnu/lib/libiberty/include/libiberty.h
index 9c773343d39..676ceaba4a9 100644
--- a/gnu/lib/libiberty/include/libiberty.h
+++ b/gnu/lib/libiberty/include/libiberty.h
@@ -155,7 +155,7 @@ extern long get_run_time PARAMS ((void));
 extern char *make_relative_prefix PARAMS ((const char *, const char *,
 					   const char *));
 
-/* Choose a temporary directory to use for scratch files, DEPRECATED */
+/* Choose a temporary directory to use for scratch files.  */
 
 extern char *choose_temp_base PARAMS ((void)) ATTRIBUTE_MALLOC;