* inftarg.c (child_thread_alive): New function to see if a

[deliverable/binutils-gdb.git] / gdb / c-typeprint.c

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 306123dc82893cb4711b5e1e60d37b94f2eb94b3..aa5b014689950d1a79e361cb0a2141c446f52213 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -386,7 +386,8 @@ c_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args)
        fprintf_filtered (stream, ")");
       
       fprintf_filtered (stream, "[");
-      if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0)
+      if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
+         && TYPE_ARRAY_UPPER_BOUND_TYPE(type) != BOUND_CANNOT_BE_DETERMINED)
        fprintf_filtered (stream, "%d",
                          (TYPE_LENGTH (type)
                           / TYPE_LENGTH (TYPE_TARGET_TYPE (type))));
@@ -420,7 +421,19 @@ c_type_print_varspec_suffix (type, stream, show, passed_a_ptr, demangled_args)
       if (passed_a_ptr)
        fprintf_filtered (stream, ")");
       if (!demangled_args)
-       fprintf_filtered (stream, "()");
+       { int i, len = TYPE_NFIELDS (type);
+         fprintf_filtered (stream, "(");
+         for (i = 0; i < len; i++)
+           {
+             if (i > 0)
+               {
+                 fputs_filtered (", ", stream);
+                 wrap_here ("    ");
+               }
+             c_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0);
+           }
+         fprintf_filtered (stream, ")");
+       }
       c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, 0,
                                   passed_a_ptr, 0);
       break;