From bff76bc36ff2b158bb702f9d579e2ff039a252b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 3 Dec 2013 15:35:50 +0100 Subject: [PATCH] gmessages: make _g_log_abort() do only breakpoints again Commit e53caad4 makes _g_log_abort() noreturn by calling abort() unconditionally. However, it is useful to be able to skip some log_abort() with a debugger, to reach a point of interest. Revert back to previous behaviour. Make g_assert_warning() noreturn by calling abort(). https://bugzilla.gnome.org/show_bug.cgi?id=711800 --- glib/gmessages.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/glib/gmessages.c b/glib/gmessages.c index 0a8dc82..a118002 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -290,7 +290,7 @@ static gpointer fatal_log_data; /* --- functions --- */ -static void _g_log_abort (gboolean breakpoint) G_GNUC_NORETURN; +static void _g_log_abort (gboolean breakpoint); static void _g_log_abort (gboolean breakpoint) @@ -307,8 +307,8 @@ _g_log_abort (gboolean breakpoint) if (breakpoint) G_BREAKPOINT (); - - abort (); + else + abort (); } #ifdef G_OS_WIN32 @@ -1130,6 +1130,7 @@ g_assert_warning (const char *log_domain, pretty_function, expression); _g_log_abort (FALSE); + abort (); } /** -- 2.7.4