mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-24 22:46:15 +01:00
Use the #if branch with G_BREAKPOINT() also on Win32. Remove the separate
2002-02-14 Tor Lillqvist <tml@iki.fi> * glib/gmessages.c (g_logv): Use the #if branch with G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for MSVC, G_BREAKPOINT() does exactly that.
This commit is contained in:
parent
f99e38b2b1
commit
de3bfc0a74
@ -1,3 +1,9 @@
|
|||||||
|
2002-02-14 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* glib/gmessages.c (g_logv): Use the #if branch with
|
||||||
|
G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for
|
||||||
|
MSVC, G_BREAKPOINT() does exactly that.
|
||||||
|
|
||||||
2002-02-14 James Henstridge <james@daa.com.au>
|
2002-02-14 James Henstridge <james@daa.com.au>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2002-02-14 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* glib/gmessages.c (g_logv): Use the #if branch with
|
||||||
|
G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for
|
||||||
|
MSVC, G_BREAKPOINT() does exactly that.
|
||||||
|
|
||||||
2002-02-14 James Henstridge <james@daa.com.au>
|
2002-02-14 James Henstridge <james@daa.com.au>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2002-02-14 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* glib/gmessages.c (g_logv): Use the #if branch with
|
||||||
|
G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for
|
||||||
|
MSVC, G_BREAKPOINT() does exactly that.
|
||||||
|
|
||||||
2002-02-14 James Henstridge <james@daa.com.au>
|
2002-02-14 James Henstridge <james@daa.com.au>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2002-02-14 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* glib/gmessages.c (g_logv): Use the #if branch with
|
||||||
|
G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for
|
||||||
|
MSVC, G_BREAKPOINT() does exactly that.
|
||||||
|
|
||||||
2002-02-14 James Henstridge <james@daa.com.au>
|
2002-02-14 James Henstridge <james@daa.com.au>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2002-02-14 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* glib/gmessages.c (g_logv): Use the #if branch with
|
||||||
|
G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for
|
||||||
|
MSVC, G_BREAKPOINT() does exactly that.
|
||||||
|
|
||||||
2002-02-14 James Henstridge <james@daa.com.au>
|
2002-02-14 James Henstridge <james@daa.com.au>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2002-02-14 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* glib/gmessages.c (g_logv): Use the #if branch with
|
||||||
|
G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for
|
||||||
|
MSVC, G_BREAKPOINT() does exactly that.
|
||||||
|
|
||||||
2002-02-14 James Henstridge <james@daa.com.au>
|
2002-02-14 James Henstridge <james@daa.com.au>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2002-02-14 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* glib/gmessages.c (g_logv): Use the #if branch with
|
||||||
|
G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for
|
||||||
|
MSVC, G_BREAKPOINT() does exactly that.
|
||||||
|
|
||||||
2002-02-14 James Henstridge <james@daa.com.au>
|
2002-02-14 James Henstridge <james@daa.com.au>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2002-02-14 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* glib/gmessages.c (g_logv): Use the #if branch with
|
||||||
|
G_BREAKPOINT() also on Win32. Remove the separate __asm int 3 for
|
||||||
|
MSVC, G_BREAKPOINT() does exactly that.
|
||||||
|
|
||||||
2002-02-14 James Henstridge <james@daa.com.au>
|
2002-02-14 James Henstridge <james@daa.com.au>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
* m4macros/glib-gettext.m4: add third argument to the AC_DEFINE
|
||||||
|
@ -537,21 +537,17 @@ g_logv (const gchar *log_domain,
|
|||||||
|
|
||||||
if (test_level & G_LOG_FLAG_FATAL)
|
if (test_level & G_LOG_FLAG_FATAL)
|
||||||
{
|
{
|
||||||
#if defined (G_ENABLE_DEBUG) && defined (SIGTRAP)
|
#ifdef G_OS_WIN32
|
||||||
|
MessageBox (NULL, fatal_msg_buf, NULL, MB_OK);
|
||||||
|
#endif
|
||||||
|
#if defined (G_ENABLE_DEBUG) && (defined (SIGTRAP) || defined (G_OS_WIN32))
|
||||||
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 */
|
#else /* !G_ENABLE_DEBUG || !(SIGTRAP || G_OS_WIN32) */
|
||||||
#ifdef G_OS_WIN32
|
|
||||||
MessageBox (NULL, fatal_msg_buf, NULL, MB_OK);
|
|
||||||
#endif
|
|
||||||
# if defined (_MSC_VER) && defined (_DEBUG)
|
|
||||||
/* let's see the call stack ... */
|
|
||||||
__asm int 3
|
|
||||||
# endif
|
|
||||||
abort ();
|
abort ();
|
||||||
#endif /* !G_ENABLE_DEBUG || !SIGTRAP */
|
#endif /* !G_ENABLE_DEBUG || !(SIGTRAP || G_OS_WIN32) */
|
||||||
}
|
}
|
||||||
|
|
||||||
depth--;
|
depth--;
|
||||||
|
Loading…
Reference in New Issue
Block a user