Move gdbserver tdesc header funcs to c file

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

diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index d35d3e58f140961858205a41f558d779f4f46a2d..27e94292112e4ef0adf5c487feda7a5f7878bcd5 100644 (file)
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -1,5 +1,5 @@
 /* Support for printing Modula 2 types for GDB, the GNU debugger.
-   Copyright (C) 1986-2016 Free Software Foundation, Inc.
+   Copyright (C) 1986-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -280,7 +280,8 @@ m2_procedure (struct type *type, struct ui_file *stream,
 {
   fprintf_filtered (stream, "PROCEDURE ");
   m2_type_name (type, stream);
-  if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
+  if (TYPE_TARGET_TYPE (type) == NULL
+      || TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
     {
       int i, len = TYPE_NFIELDS (type);
 
@@ -294,11 +295,11 @@ m2_procedure (struct type *type, struct ui_file *stream,
            }
          m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags);
        }
+      fprintf_filtered (stream, ") : ");
       if (TYPE_TARGET_TYPE (type) != NULL)
-       {
-         fprintf_filtered (stream, " : ");
-         m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);
-       }
+       m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);
+      else
+       type_print_unknown_return_type (stream);
     }
 }