luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 03:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

sh portability fix. Use "test" and not [. (#163144, Robert Ögren)

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

	* configure.in: sh portability fix. Use "test" and not [.
	(#163144, Robert Ögren)

	* 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 02:04:32 +00:00 committed by Tor Lillqvist
parent d9d36b1bc8
commit 942dcc179e
7 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2005-01-19 Tor Lillqvist <tml@iki.fi>
* configure.in: sh portability fix. Use "test" and not [.
(#163144, Robert Ögren)
* 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>
* glib/gkeyfile.c (g_key_file_get_boolean_list): Fix a

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
2005-01-19 Tor Lillqvist <tml@iki.fi>
* configure.in: sh portability fix. Use "test" and not [.
(#163144, Robert Ögren)
* 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>
* glib/gkeyfile.c (g_key_file_get_boolean_list): Fix a

12
ChangeLog.pre-2-12
View File

@ -1,3 +1,15 @@
2005-01-19 Tor Lillqvist <tml@iki.fi>
* configure.in: sh portability fix. Use "test" and not [.
(#163144, Robert Ögren)
* 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>
* glib/gkeyfile.c (g_key_file_get_boolean_list): Fix a

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
2005-01-19 Tor Lillqvist <tml@iki.fi>
* configure.in: sh portability fix. Use "test" and not [.
(#163144, Robert Ögren)
* 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>
* glib/gkeyfile.c (g_key_file_get_boolean_list): Fix a

2
configure.in
View File

@ -170,7 +170,7 @@ AC_SUBST(TESTGMODULE_EXP)
if test "$glib_native_win32" = "yes"; then
AC_CHECK_TOOL(NM, nm, no)
if [ "$NM" = no ]; then
if test "$NM" = no; then
AC_MSG_ERROR([*** Could not find an implementation of nm in your PATH.])
fi
AC_CHECK_TOOL(RANLIB, ranlib, :)

5
glib/gbacktrace.c
View File

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

23
glib/gmessages.c
View File

@ -476,17 +476,28 @@ g_logv (const gchar *log_domain,
#ifdef G_OS_WIN32
gchar *locale_msg = g_locale_from_utf8 (fatal_msg_buf, -1, NULL, NULL, NULL);
MessageBox (NULL, locale_msg, NULL,
MB_ICONERROR|MB_SETFOREGROUND);
#endif
#if defined (G_ENABLE_DEBUG) && (defined (SIGTRAP) || defined (G_OS_WIN32))
if (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION))
{
MessageBox (NULL, locale_msg, NULL,
MB_ICONERROR|MB_SETFOREGROUND);
G_BREAKPOINT ();
}
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))
G_BREAKPOINT ();
else
abort ();
#else /* !G_ENABLE_DEBUG || !(SIGTRAP || G_OS_WIN32) */
#else /* !G_ENABLE_DEBUG || !SIGTRAP */
abort ();
#endif /* !G_ENABLE_DEBUG || !(SIGTRAP || G_OS_WIN32) */
#endif /* !G_ENABLE_DEBUG || !SIGTRAP */
#endif /* !G_OS_WIN32 */
}
depth--;