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.

diff --git a/ChangeLog b/ChangeLog
index 3a1d227..3e3901f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * m4macros/glib-gettext.m4: add third argument to the AC_DEFINE

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3a1d227..3e3901f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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>
 
        * m4macros/glib-gettext.m4: add third argument to the AC_DEFINE

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3a1d227..3e3901f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * m4macros/glib-gettext.m4: add third argument to the AC_DEFINE

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3a1d227..3e3901f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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>
 
        * m4macros/glib-gettext.m4: add third argument to the AC_DEFINE

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3a1d227..3e3901f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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>
 
        * m4macros/glib-gettext.m4: add third argument to the AC_DEFINE

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3a1d227..3e3901f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
        * m4macros/glib-gettext.m4: add third argument to the AC_DEFINE

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3a1d227..3e3901f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        * m4macros/glib-gettext.m4: add third argument to the AC_DEFINE

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3a1d227..3e3901f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        * m4macros/glib-gettext.m4: add third argument to the AC_DEFINE

diff --git a/glib/gmessages.c b/glib/gmessages.c
index c8707ed..3dbd901 100644 (file)
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -537,21 +537,17 @@ g_logv (const gchar   *log_domain,
          
          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))
                G_BREAKPOINT ();
              else
                abort ();
-#else /* !G_ENABLE_DEBUG || !SIGTRAP */
-#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
+#else /* !G_ENABLE_DEBUG || !(SIGTRAP || G_OS_WIN32) */
              abort ();
-#endif /* !G_ENABLE_DEBUG || !SIGTRAP */
+#endif /* !G_ENABLE_DEBUG || !(SIGTRAP || G_OS_WIN32) */
            }
          
          depth--;