summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdk-pixbuf/ChangeLog7
-rwxr-xr-xgdk-pixbuf/abicheck.sh2
-rw-r--r--gdk-pixbuf/gdk-pixbuf-private.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 454881041..99a59e823 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 15 18:58:22 2004 Manish Singh <yosh@gimp.org>
+
+ * gdk-pixbuf-private.h: _gdk_pixbuf_lock now returns a gboolean.
+
+ * abicheck.sh: don't hardcode lengths for cut, instead split on
+ the third field.
+
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gdk-pixbuf-animation.c:
diff --git a/gdk-pixbuf/abicheck.sh b/gdk-pixbuf/abicheck.sh
index 5932bb84b..fe617da64 100755
--- a/gdk-pixbuf/abicheck.sh
+++ b/gdk-pixbuf/abicheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
cpp -P ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' | sort > expected-abi
-nm -D .libs/libgdk_pixbuf-2.0.so | grep " T " | cut -c12- | sort > actual-abi
+nm -D .libs/libgdk_pixbuf-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/gdk-pixbuf/gdk-pixbuf-private.h b/gdk-pixbuf/gdk-pixbuf-private.h
index 59053a99d..9e48b32a5 100644
--- a/gdk-pixbuf/gdk-pixbuf-private.h
+++ b/gdk-pixbuf/gdk-pixbuf-private.h
@@ -79,7 +79,7 @@ struct _GdkPixbufClass {
#ifdef GDK_PIXBUF_ENABLE_BACKEND
-void _gdk_pixbuf_lock (GdkPixbufModule *image_module);
+gboolean _gdk_pixbuf_lock (GdkPixbufModule *image_module);
void _gdk_pixbuf_unlock (GdkPixbufModule *image_module);
GdkPixbufModule *_gdk_pixbuf_get_module (guchar *buffer, guint size,