merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index b9d6e73f89e2f7c7a33515d817ec060092dda685..ff78db566fd8687110bb3391455cae9fbc729f32 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-07  Andreas Jaeger  <aj@suse.de>
+
+       * testsuite/test-demangle.c: Include <string.h> and <stdlib.h> for
+       prototypes.
+       (main): Initialize style.
+
 2004-02-24  Ian Lance Taylor  <ian@wasabisystems.com>
 
        * cp-demangle.h (enum d_builtin_type_print): Add D_PRINT_UNSIGNED,

diff --git a/libiberty/testsuite/test-demangle.c b/libiberty/testsuite/test-demangle.c
index 6e00d1416d789dbbfbbed531091ec359605e652e..4d515fab5343109756afd916bed2e617ffbaea28 100644 (file)
--- a/libiberty/testsuite/test-demangle.c
+++ b/libiberty/testsuite/test-demangle.c
@@ -26,6 +26,12 @@
 #include <stdio.h>
 #include "libiberty.h"
 #include "demangle.h"
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 
 struct line
 {
@@ -119,7 +125,7 @@ main(argc, argv)
      int argc;
      char **argv;
 {
-  enum demangling_styles style;
+  enum demangling_styles style = auto_demangling;
   int no_params;
   int is_v3_ctor;
   int is_v3_dtor;