* exceptions.h (TRY_CATCH): Define setjmp/sigsetjmp macro safe.

	(plus a tiny ChangeLog fix)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d3a1a80f87011b08dff12141144be7dcaf40f06d..3da78327d07ebd67cb4e08ca2dce29b715a1d5c0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,7 +1,11 @@
-2004-03-09  Joel Brobecker  <brobecker@adacore.com>
+2005-03-09  Corinna Vinschen  <vinschen@redhat.com>
 
-        * dwarf2read.c (dwarf_decode_lines): Use the complete filename
-        when creating include psymtabs.
+       * exceptions.h (TRY_CATCH): Define setjmp/sigsetjmp macro safe.
+
+2005-03-09  Joel Brobecker  <brobecker@adacore.com>
+
+       * dwarf2read.c (dwarf_decode_lines): Use the complete filename
+       when creating include psymtabs.
 
 2005-03-08  Mark Mitchell  <mark@codesourcery.com>
 

diff --git a/gdb/exceptions.h b/gdb/exceptions.h
index a47742a384f1306003e27165f376e022f12e532e..c07289bf1799f08e3ec7977f4c6b00f0bf71ee34 100644 (file)
--- a/gdb/exceptions.h
+++ b/gdb/exceptions.h
@@ -115,10 +115,13 @@ int exceptions_state_mc_action_iter_1 (void);
   */
 
 #define TRY_CATCH(EXCEPTION,MASK) \
-    for (EXCEPTIONS_SIGSETJMP \
-           (*exceptions_state_mc_init (uiout, &(EXCEPTION), (MASK))); \
-         exceptions_state_mc_action_iter (); ) \
-      while (exceptions_state_mc_action_iter_1 ())
+     { \
+       EXCEPTIONS_SIGJMP_BUF *buf = \
+        exceptions_state_mc_init (uiout, &(EXCEPTION), (MASK)); \
+       EXCEPTIONS_SIGSETJMP (*buf); \
+     } \
+     while (exceptions_state_mc_action_iter ()) \
+       while (exceptions_state_mc_action_iter_1 ())
 
 /* *INDENT-ON* */