filter out G_GNUC stuff when doing the compare.

Thu Nov 25 14:02:43 2004  Manish Singh  <yosh@gimp.org>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index 70a713a..106f5fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 25 14:02:43 2004  Manish Singh  <yosh@gimp.org>
+
+       * 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  <kmaraas@gnome.org>
 
        * configure.in: Add «nb» to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 70a713a..106f5fb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Nov 25 14:02:43 2004  Manish Singh  <yosh@gimp.org>
+
+       * 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  <kmaraas@gnome.org>
 
        * configure.in: Add «nb» to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 70a713a..106f5fb 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Thu Nov 25 14:02:43 2004  Manish Singh  <yosh@gimp.org>
+
+       * 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  <kmaraas@gnome.org>
 
        * configure.in: Add «nb» to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 70a713a..106f5fb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Nov 25 14:02:43 2004  Manish Singh  <yosh@gimp.org>
+
+       * 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  <kmaraas@gnome.org>
 
        * configure.in: Add «nb» to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 70a713a..106f5fb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Nov 25 14:02:43 2004  Manish Singh  <yosh@gimp.org>
+
+       * 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  <kmaraas@gnome.org>
 
        * configure.in: Add «nb» to ALL_LINGUAS.

diff --git a/glib/abicheck.sh b/glib/abicheck.sh
index 27f9cc6..046a250 100755 (executable)
--- 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 7457899..eb11d16 100644 (file)
--- 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') || \