Fix non-Intel/-Alpha version of the G_BREAKPOINT macro to include

2001-10-29  Daniel Egger  <degger@fhm.edu>

	* glib/gbacktrace.h: Fix non-Intel/-Alpha version of the
	G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.

diff --git a/ChangeLog b/ChangeLog
index fbd12e3c2459bcc1ef29412d41a199272b21603a..c09eb29f9c9dcf8423dd6a60b53ee8ab9fd4b5bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-10-29  Daniel Egger  <degger@fhm.edu>
+
+       * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the 
+       G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.
+
 Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * 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 fbd12e3c2459bcc1ef29412d41a199272b21603a..c09eb29f9c9dcf8423dd6a60b53ee8ab9fd4b5bc 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+2001-10-29  Daniel Egger  <degger@fhm.edu>
+
+       * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the 
+       G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.
+
 Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * 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 fbd12e3c2459bcc1ef29412d41a199272b21603a..c09eb29f9c9dcf8423dd6a60b53ee8ab9fd4b5bc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2001-10-29  Daniel Egger  <degger@fhm.edu>
+
+       * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the 
+       G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.
+
 Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * 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 fbd12e3c2459bcc1ef29412d41a199272b21603a..c09eb29f9c9dcf8423dd6a60b53ee8ab9fd4b5bc 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,15 @@
+2001-10-29  Daniel Egger  <degger@fhm.edu>
+
+       * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the 
+       G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.
+
 Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * 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 fbd12e3c2459bcc1ef29412d41a199272b21603a..c09eb29f9c9dcf8423dd6a60b53ee8ab9fd4b5bc 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+2001-10-29  Daniel Egger  <degger@fhm.edu>
+
+       * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the 
+       G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.
+
 Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * 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 fbd12e3c2459bcc1ef29412d41a199272b21603a..c09eb29f9c9dcf8423dd6a60b53ee8ab9fd4b5bc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+2001-10-29  Daniel Egger  <degger@fhm.edu>
+
+       * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the 
+       G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.
+
 Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * 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 fbd12e3c2459bcc1ef29412d41a199272b21603a..c09eb29f9c9dcf8423dd6a60b53ee8ab9fd4b5bc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2001-10-29  Daniel Egger  <degger@fhm.edu>
+
+       * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the 
+       G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.
+
 Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * 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 fbd12e3c2459bcc1ef29412d41a199272b21603a..c09eb29f9c9dcf8423dd6a60b53ee8ab9fd4b5bc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2001-10-29  Daniel Egger  <degger@fhm.edu>
+
+       * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the 
+       G_BREAKPOINT macro to include <signal.h> 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 <string.h> to avoid warnings.
+
 Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>
 
        * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG

diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index 93b51749ca9b396cd03dde8dde6fe2d8badba575..c2f2fcd8b225cd107a7ba1772051930c62b6e4d0 100644 (file)
--- 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 <signal.h> /* 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 fd6461be51f804ef4ed8fcb4ba1079f9c926bdf3..0457bfd23edbe7713ece7a5dc21ccbaa644c6460 100644 (file)
--- 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 e7d5216cee88507e0d9977b5a8e785e10bb405a0..fbf5c7c6134336cca813237051ec26a4171eb798 100644 (file)
--- 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 <string.h>
+
 #undef G_LOG_DOMAIN
 #define        G_LOG_DOMAIN "TestObject"
 #include       <glib-object.h>
 
-
 /* --- 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 e7d5216cee88507e0d9977b5a8e785e10bb405a0..fbf5c7c6134336cca813237051ec26a4171eb798 100644 (file)
--- 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 <string.h>
+
 #undef G_LOG_DOMAIN
 #define        G_LOG_DOMAIN "TestObject"
 #include       <glib-object.h>
 
-
 /* --- 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 f881098788b35fcfa7e9fb7ce18e4f45118bbb9b..1dc4cfa9283ce162a15897f397ca330b444dcefe 100644 (file)
--- 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 <string.h>
+
+#include "glib.h"
 
 /* keep enum and structure of gpattern.c and patterntest.c in sync */
 typedef enum