luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-19 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

On Win32 call G_BREAKPOINT() if being debugged.

Browse Source 
2005-01-19  Tor Lillqvist  <tml@novell.com>

	* glib/gbacktrace.c (g_on_error_stack_trace): On Win32 call
	G_BREAKPOINT() if being debugged.

	* glib/gmessages.c (g_logv): For fatal messages on Win32, use
	G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being
	debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit().
This commit is contained in:
Tor Lillqvist 2005-01-19 01:55:40 +00:00 committed by Tor Lillqvist
parent 4b95bf234b
commit a4bfec4f1d
6 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-01-19 Tor Lillqvist <tml@novell.com>
* glib/gbacktrace.c (g_on_error_stack_trace): On Win32 call
G_BREAKPOINT() if being debugged.
* glib/gmessages.c (g_logv): For fatal messages on Win32, use
G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being
debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit().
2005-01-18 Matthias Clasen <mclasen@redhat.com> 2005-01-18 Matthias Clasen <mclasen@redhat.com>
* glib/gqsort.c: Don't include alloca.h. It is not needed, * glib/gqsort.c: Don't include alloca.h. It is not needed,

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2005-01-19 Tor Lillqvist <tml@novell.com>
* glib/gbacktrace.c (g_on_error_stack_trace): On Win32 call
G_BREAKPOINT() if being debugged.
* glib/gmessages.c (g_logv): For fatal messages on Win32, use
G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being
debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit().
2005-01-18 Matthias Clasen <mclasen@redhat.com> 2005-01-18 Matthias Clasen <mclasen@redhat.com>
* glib/gqsort.c: Don't include alloca.h. It is not needed, * glib/gqsort.c: Don't include alloca.h. It is not needed,

9
ChangeLog.pre-2-12
View File

@ -1,3 +1,12 @@
2005-01-19 Tor Lillqvist <tml@novell.com>
* glib/gbacktrace.c (g_on_error_stack_trace): On Win32 call
G_BREAKPOINT() if being debugged.
* glib/gmessages.c (g_logv): For fatal messages on Win32, use
G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being
debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit().
2005-01-18 Matthias Clasen <mclasen@redhat.com> 2005-01-18 Matthias Clasen <mclasen@redhat.com>
* glib/gqsort.c: Don't include alloca.h. It is not needed, * glib/gqsort.c: Don't include alloca.h. It is not needed,

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2005-01-19 Tor Lillqvist <tml@novell.com>
* glib/gbacktrace.c (g_on_error_stack_trace): On Win32 call
G_BREAKPOINT() if being debugged.
* glib/gmessages.c (g_logv): For fatal messages on Win32, use
G_BREAKPOINT() also without G_ENABLE_DEBUG, but only if being
debugged. Suggestion by Ulf Lamping. Otherwise use FatalAppExit().
2005-01-18 Matthias Clasen <mclasen@redhat.com> 2005-01-18 Matthias Clasen <mclasen@redhat.com>
* glib/gqsort.c: Don't include alloca.h. It is not needed, * glib/gqsort.c: Don't include alloca.h. It is not needed,

3
glib/gbacktrace.c
View File

@ -185,6 +185,9 @@ g_on_error_stack_trace (const gchar *prg_name)
; ;
glib_on_error_halt = TRUE; glib_on_error_halt = TRUE;
#else #else
if (IsDebuggerPresent ())
G_BREAKPOINT ();
else
abort (); abort ();
#endif #endif
} }

19
glib/gmessages.c
View File

@ -476,17 +476,28 @@ g_logv (const gchar *log_domain,
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *locale_msg = g_locale_from_utf8 (fatal_msg_buf, -1, NULL, NULL, NULL); gchar *locale_msg = g_locale_from_utf8 (fatal_msg_buf, -1, NULL, NULL, NULL);
if (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION))
{
MessageBox (NULL, locale_msg, NULL, MessageBox (NULL, locale_msg, NULL,
MB_ICONERROR|MB_SETFOREGROUND); MB_ICONERROR|MB_SETFOREGROUND);
#endif G_BREAKPOINT ();
#if defined (G_ENABLE_DEBUG) && (defined (SIGTRAP) || defined (G_OS_WIN32)) }
FatalAppExit (0, locale_msg);
/* In case somebody runs a debug Windows and chooses to
* continue, don't let her.
*/
abort ();
#else
#if defined (G_ENABLE_DEBUG) && defined (SIGTRAP)
if (!(test_level & G_LOG_FLAG_RECURSION)) if (!(test_level & G_LOG_FLAG_RECURSION))
G_BREAKPOINT (); G_BREAKPOINT ();
else else
abort (); abort ();
#else /* !G_ENABLE_DEBUG || !(SIGTRAP || G_OS_WIN32) */ #else /* !G_ENABLE_DEBUG || !SIGTRAP */
abort (); abort ();
#endif /* !G_ENABLE_DEBUG || !(SIGTRAP || G_OS_WIN32) */ #endif /* !G_ENABLE_DEBUG || !SIGTRAP */
#endif /* !G_OS_WIN32 */
} }
depth--; depth--;