From 062ecaf1ed6be60135ea19214bfa3e99a3b2aa93 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Mon, 29 Oct 2001 18:49:28 +0000 Subject: [PATCH] Fix non-Intel/-Alpha version of the G_BREAKPOINT macro to include 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the G_BREAKPOINT macro to include and use SIGTRAP. * glib/gmessages.c: Conditionalise definition of args2 depending on the definition of HAVE_VSNPRINTF to avoid compiler warning. * gobject/testgruntime.c * tests/patterntest.c: Include to avoid warnings. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-0 | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-12 | 12 ++++++++++++ ChangeLog.pre-2-2 | 12 ++++++++++++ ChangeLog.pre-2-4 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ glib/gbacktrace.h | 3 ++- glib/gmessages.c | 5 ++++- gobject/testgobject.c | 4 +++- gobject/testgruntime.c | 4 +++- tests/patterntest.c | 4 +++- 13 files changed, 111 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbd12e3..c09eb29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2001-10-29 Daniel Egger + + * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the + G_BREAKPOINT macro to include and use SIGTRAP. + + * glib/gmessages.c: Conditionalise definition of args2 + depending on the definition of HAVE_VSNPRINTF to avoid + compiler warning. + + * gobject/testgruntime.c + * tests/patterntest.c: Include to avoid warnings. + Mon Oct 29 11:29:37 2001 Owen Taylor * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fbd12e3..c09eb29 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,15 @@ +2001-10-29 Daniel Egger + + * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the + G_BREAKPOINT macro to include and use SIGTRAP. + + * glib/gmessages.c: Conditionalise definition of args2 + depending on the definition of HAVE_VSNPRINTF to avoid + compiler warning. + + * gobject/testgruntime.c + * tests/patterntest.c: Include to avoid warnings. + Mon Oct 29 11:29:37 2001 Owen Taylor * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fbd12e3..c09eb29 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +2001-10-29 Daniel Egger + + * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the + G_BREAKPOINT macro to include and use SIGTRAP. + + * glib/gmessages.c: Conditionalise definition of args2 + depending on the definition of HAVE_VSNPRINTF to avoid + compiler warning. + + * gobject/testgruntime.c + * tests/patterntest.c: Include to avoid warnings. + Mon Oct 29 11:29:37 2001 Owen Taylor * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index fbd12e3..c09eb29 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,15 @@ +2001-10-29 Daniel Egger + + * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the + G_BREAKPOINT macro to include and use SIGTRAP. + + * glib/gmessages.c: Conditionalise definition of args2 + depending on the definition of HAVE_VSNPRINTF to avoid + compiler warning. + + * gobject/testgruntime.c + * tests/patterntest.c: Include to avoid warnings. + Mon Oct 29 11:29:37 2001 Owen Taylor * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fbd12e3..c09eb29 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,15 @@ +2001-10-29 Daniel Egger + + * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the + G_BREAKPOINT macro to include and use SIGTRAP. + + * glib/gmessages.c: Conditionalise definition of args2 + depending on the definition of HAVE_VSNPRINTF to avoid + compiler warning. + + * gobject/testgruntime.c + * tests/patterntest.c: Include to avoid warnings. + Mon Oct 29 11:29:37 2001 Owen Taylor * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fbd12e3..c09eb29 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +2001-10-29 Daniel Egger + + * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the + G_BREAKPOINT macro to include and use SIGTRAP. + + * glib/gmessages.c: Conditionalise definition of args2 + depending on the definition of HAVE_VSNPRINTF to avoid + compiler warning. + + * gobject/testgruntime.c + * tests/patterntest.c: Include to avoid warnings. + Mon Oct 29 11:29:37 2001 Owen Taylor * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fbd12e3..c09eb29 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +2001-10-29 Daniel Egger + + * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the + G_BREAKPOINT macro to include and use SIGTRAP. + + * glib/gmessages.c: Conditionalise definition of args2 + depending on the definition of HAVE_VSNPRINTF to avoid + compiler warning. + + * gobject/testgruntime.c + * tests/patterntest.c: Include to avoid warnings. + Mon Oct 29 11:29:37 2001 Owen Taylor * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fbd12e3..c09eb29 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +2001-10-29 Daniel Egger + + * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the + G_BREAKPOINT macro to include and use SIGTRAP. + + * glib/gmessages.c: Conditionalise definition of args2 + depending on the definition of HAVE_VSNPRINTF to avoid + compiler warning. + + * gobject/testgruntime.c + * tests/patterntest.c: Include to avoid warnings. + Mon Oct 29 11:29:37 2001 Owen Taylor * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h index 93b5174..c2f2fcd 100644 --- a/glib/gbacktrace.h +++ b/glib/gbacktrace.h @@ -53,7 +53,8 @@ void g_on_error_stack_trace (const gchar *prg_name); #elif defined (__alpha__) && defined (__GNUC__) && __GNUC__ >= 2 # define G_BREAKPOINT() G_STMT_START{ __asm__ __volatile__ ("bpt"); }G_STMT_END #else /* !__i386__ && !__alpha__ */ -# define G_BREAKPOINT() G_STMT_START{ raise (5 /* SIGTRAP */); }G_STMT_END +#include /* For prototype and signal name definition */ +# define G_BREAKPOINT() G_STMT_START{ raise (SIGTRAP); }G_STMT_END #endif /* __i386__ */ G_END_DECLS diff --git a/glib/gmessages.c b/glib/gmessages.c index fd6461b..0457bfd 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -473,9 +473,12 @@ g_logv (const gchar *log_domain, const gchar *format, va_list args1) { - va_list args2; gchar buffer[1025]; register gint i; + +#ifndef HAVE_VSNPRINTF + va_list args2; +#endif /* !HAVE_VSNPRINTF */ log_level &= G_LOG_LEVEL_MASK; if (!log_level) diff --git a/gobject/testgobject.c b/gobject/testgobject.c index e7d5216..fbf5c7c 100644 --- a/gobject/testgobject.c +++ b/gobject/testgobject.c @@ -16,11 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ + +#include + #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "TestObject" #include - /* --- TestIface --- */ #define TEST_TYPE_IFACE (test_iface_get_type ()) #define TEST_IFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_IFACE, TestIface)) diff --git a/gobject/testgruntime.c b/gobject/testgruntime.c index e7d5216..fbf5c7c 100644 --- a/gobject/testgruntime.c +++ b/gobject/testgruntime.c @@ -16,11 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307, USA. */ + +#include + #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "TestObject" #include - /* --- TestIface --- */ #define TEST_TYPE_IFACE (test_iface_get_type ()) #define TEST_IFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_TYPE_IFACE, TestIface)) diff --git a/tests/patterntest.c b/tests/patterntest.c index f881098..1dc4cfa 100644 --- a/tests/patterntest.c +++ b/tests/patterntest.c @@ -16,8 +16,10 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "glib.h" +#include + +#include "glib.h" /* keep enum and structure of gpattern.c and patterntest.c in sync */ typedef enum -- 2.7.4