aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/defs.h2
-rw-r--r--gdb/top.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c14f6c0..cce8d6d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-14 Mark Kettenis <kettenis@gnu.org>
+
+ * defs.h (deprecated_error_hook): Remove RETURN and ATTR_NORETURN
+ from declaration.
+ * top.c (deprecated_error_hook): Remove RETURN and ATTR_NORETURN
+ from definition.
+
2004-08-13 Mark Kettenis <kettenis@gnu.org>
* configure.in (PTRACE_TYPE_ARG3, PTRACE_TYPE_ARG5): Don't use
diff --git a/gdb/defs.h b/gdb/defs.h
index 8e2ba64..5861b43 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -1256,7 +1256,7 @@ extern void (*deprecated_call_command_hook) (struct cmd_list_element * c,
extern void (*deprecated_set_hook) (struct cmd_list_element * c);
-extern NORETURN void (*deprecated_error_hook) (void) ATTR_NORETURN;
+extern void (*deprecated_error_hook) (void);
extern void (*deprecated_error_begin_hook) (void);
diff --git a/gdb/top.c b/gdb/top.c
index e282b2e..c072d96 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -290,7 +290,7 @@ void (*deprecated_context_hook) (int id);
/* Takes control from error (). Typically used to prevent longjmps out of the
middle of the GUI. Usually used in conjunction with a catch routine. */
-NORETURN void (*deprecated_error_hook) (void) ATTR_NORETURN;
+void (*deprecated_error_hook) (void);
/* One should use catch_errors rather than manipulating these