filter G_GNUC before PRIVATE so $ is still true.

Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>

        * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.

        * tests/utf8-validate.c: cast pointer math to gint for error print
        message.

diff --git a/ChangeLog b/ChangeLog
index 33ac8a3a891f65b35fe4e74dc9aa3d845f9bdf4f..1c72868f773d6cdcf9aa9fec9f2ca736e16a94e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.
+
+       * tests/utf8-validate.c: cast pointer math to gint for error print
+       message.
+
 Sun Nov 28 12:07:29 2004  Manish Singh  <yosh@gimp.org>
 
        * tests/utf8-validate.c: minor comment fix.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 33ac8a3a891f65b35fe4e74dc9aa3d845f9bdf4f..1c72868f773d6cdcf9aa9fec9f2ca736e16a94e5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.
+
+       * tests/utf8-validate.c: cast pointer math to gint for error print
+       message.
+
 Sun Nov 28 12:07:29 2004  Manish Singh  <yosh@gimp.org>
 
        * tests/utf8-validate.c: minor comment fix.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 33ac8a3a891f65b35fe4e74dc9aa3d845f9bdf4f..1c72868f773d6cdcf9aa9fec9f2ca736e16a94e5 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.
+
+       * tests/utf8-validate.c: cast pointer math to gint for error print
+       message.
+
 Sun Nov 28 12:07:29 2004  Manish Singh  <yosh@gimp.org>
 
        * tests/utf8-validate.c: minor comment fix.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 33ac8a3a891f65b35fe4e74dc9aa3d845f9bdf4f..1c72868f773d6cdcf9aa9fec9f2ca736e16a94e5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.
+
+       * tests/utf8-validate.c: cast pointer math to gint for error print
+       message.
+
 Sun Nov 28 12:07:29 2004  Manish Singh  <yosh@gimp.org>
 
        * tests/utf8-validate.c: minor comment fix.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 33ac8a3a891f65b35fe4e74dc9aa3d845f9bdf4f..1c72868f773d6cdcf9aa9fec9f2ca736e16a94e5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Nov 28 13:13:56 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/abicheck.sh: filter G_GNUC before PRIVATE so $ is still true.
+
+       * tests/utf8-validate.c: cast pointer math to gint for error print
+       message.
+
 Sun Nov 28 12:07:29 2004  Manish Singh  <yosh@gimp.org>
 
        * tests/utf8-validate.c: minor comment fix.

diff --git a/glib/abicheck.sh b/glib/abicheck.sh
index 046a2502b5c9ccb5984ddaaa05db8ef37311e4af..a9bead4cc8c48e86df0822e5acaaa1d9c052676e 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$//' -e 's/ G_GNUC.*$//' | sort > expected-abi
+cpp -P -DG_OS_UNIX -DINCLUDE_INTERNAL_SYMBOLS ${srcdir:-.}/glib.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | 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/tests/utf8-validate.c b/tests/utf8-validate.c
index ab9a5b23cae473374af7ece24d41960d031c787c..98f0b1f862ece988039bb1925cebd4de0111931b 100644 (file)
--- a/tests/utf8-validate.c
+++ b/tests/utf8-validate.c
@@ -301,7 +301,7 @@ do_test (gint         index,
               index,
               str->str, max_len, 
               valid ? "TRUE" : "FALSE", offset,
-              result ? "TRUE" : "FALSE", end - text);
+              result ? "TRUE" : "FALSE", (gint) (end - text));
       g_string_free (str, FALSE);
     }
 }