From ccc3c1c4090fcd9d7c7f40bcebe1692dbee22f29 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 25 Nov 2004 22:09:30 +0000 Subject: [PATCH] filter out G_GNUC stuff when doing the compare. Thu Nov 25 14:02:43 2004 Manish Singh * glib/abicheck.sh: filter out G_GNUC stuff when doing the compare. * glib/gmessages.c (g_assert_warning): call abort() at the end, so gcc doesn't warn. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ glib/abicheck.sh | 2 +- glib/gmessages.c | 1 + 7 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70a713a8..106f5fb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 25 14:02:43 2004 Manish Singh + + * glib/abicheck.sh: filter out G_GNUC stuff when doing the compare. + + * glib/gmessages.c (g_assert_warning): call abort() at the end, so + gcc doesn't warn. + 2004-11-25 Kjartan Maraas * configure.in: Add «nb» to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 70a713a8..106f5fb3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Nov 25 14:02:43 2004 Manish Singh + + * glib/abicheck.sh: filter out G_GNUC stuff when doing the compare. + + * glib/gmessages.c (g_assert_warning): call abort() at the end, so + gcc doesn't warn. + 2004-11-25 Kjartan Maraas * configure.in: Add «nb» to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 70a713a8..106f5fb3 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Thu Nov 25 14:02:43 2004 Manish Singh + + * glib/abicheck.sh: filter out G_GNUC stuff when doing the compare. + + * glib/gmessages.c (g_assert_warning): call abort() at the end, so + gcc doesn't warn. + 2004-11-25 Kjartan Maraas * configure.in: Add «nb» to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 70a713a8..106f5fb3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Nov 25 14:02:43 2004 Manish Singh + + * glib/abicheck.sh: filter out G_GNUC stuff when doing the compare. + + * glib/gmessages.c (g_assert_warning): call abort() at the end, so + gcc doesn't warn. + 2004-11-25 Kjartan Maraas * configure.in: Add «nb» to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 70a713a8..106f5fb3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Nov 25 14:02:43 2004 Manish Singh + + * glib/abicheck.sh: filter out G_GNUC stuff when doing the compare. + + * glib/gmessages.c (g_assert_warning): call abort() at the end, so + gcc doesn't warn. + 2004-11-25 Kjartan Maraas * configure.in: Add «nb» to ALL_LINGUAS. diff --git a/glib/abicheck.sh b/glib/abicheck.sh index 27f9cc6e..046a2502 100755 --- a/glib/abicheck.sh +++ b/glib/abicheck.sh @@ -1,5 +1,5 @@ #! /bin/sh -cpp -P -DG_OS_UNIX -DINCLUDE_INTERNAL_SYMBOLS ${srcdir:-.}/glib.symbols | sed -e '/^$/d' -e 's/ PRIVATE$//' | sort > expected-abi +cpp -P -DG_OS_UNIX -DINCLUDE_INTERNAL_SYMBOLS ${srcdir:-.}/glib.symbols | sed -e '/^$/d' -e 's/ PRIVATE$//' -e 's/ G_GNUC.*$//' | sort > expected-abi nm -D .libs/libglib-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi diff -u expected-abi actual-abi && rm expected-abi actual-abi diff --git a/glib/gmessages.c b/glib/gmessages.c index 7457899c..eb11d168 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -548,6 +548,7 @@ g_assert_warning (const char *log_domain, line, pretty_function, expression); + abort (); } #define CHAR_IS_SAFE(wc) (!((wc < 0x20 && wc != '\t' && wc != '\n' && wc != '\r') || \ -- 2.34.1