Make linux_stop_lwp be a shared function

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

diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 27bd1d16b960c2ca4813d0db9e77b5914bdfb265..fd8513893eb1605268c44f8a13a2ce1a6e819bb9 100644 (file)
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -1,5 +1,5 @@
 /* Support for printing Ada types for GDB, the GNU debugger.
-   Copyright (C) 1986-2014 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -159,19 +159,19 @@ print_range (struct type *type, struct ui_file *stream,
     case TYPE_CODE_ENUM:
       {
        struct type *target_type;
-       volatile struct gdb_exception e;
        LONGEST lo = 0, hi = 0; /* init for gcc -Wall */
+       int got_error = 0;
 
        target_type = TYPE_TARGET_TYPE (type);
        if (target_type == NULL)
          target_type = type;
 
-       TRY_CATCH (e, RETURN_MASK_ERROR)
+       TRY
          {
            lo = ada_discrete_type_low_bound (type);
            hi = ada_discrete_type_high_bound (type);
          }
-       if (e.reason < 0)
+       CATCH (e, RETURN_MASK_ERROR)
          {
            /* This can happen when the range is dynamic.  Sometimes,
               resolving dynamic property values requires us to have
@@ -179,8 +179,11 @@ print_range (struct type *type, struct ui_file *stream,
               when the user is using the "ptype" command on a type.
               Print the range as an unbounded range.  */
            fprintf_filtered (stream, "<>");
+           got_error = 1;
          }
-       else
+       END_CATCH
+
+       if (!got_error)
          {
            ada_print_scalar (target_type, lo, stream);
            fprintf_filtered (stream, " .. ");