From 131f4c67fba6e7fd07bf39cf668b105e94e20cd5 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 28 Nov 2004 21:21:14 +0000 Subject: [PATCH] filter G_GNUC before PRIVATE so $ is still true. Sun Nov 28 13:13:56 2004 Manish Singh * 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. --- 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 +- tests/utf8-validate.c | 2 +- 7 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33ac8a3..1c72868 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Nov 28 13:13:56 2004 Manish Singh + + * 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 * tests/utf8-validate.c: minor comment fix. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 33ac8a3..1c72868 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun Nov 28 13:13:56 2004 Manish Singh + + * 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 * tests/utf8-validate.c: minor comment fix. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 33ac8a3..1c72868 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Sun Nov 28 13:13:56 2004 Manish Singh + + * 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 * tests/utf8-validate.c: minor comment fix. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 33ac8a3..1c72868 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun Nov 28 13:13:56 2004 Manish Singh + + * 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 * tests/utf8-validate.c: minor comment fix. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 33ac8a3..1c72868 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun Nov 28 13:13:56 2004 Manish Singh + + * 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 * tests/utf8-validate.c: minor comment fix. diff --git a/glib/abicheck.sh b/glib/abicheck.sh index 046a250..a9bead4 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$//' -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 ab9a5b2..98f0b1f 100644 --- 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); } } -- 2.7.4