GDataList: don't hold the bitlock over callbacks

[platform/upstream/glib.git] / gobject / abicheck.sh

diff --git a/gobject/abicheck.sh b/gobject/abicheck.sh
index 8a53bec..7210bd6 100755 (executable)
--- a/gobject/abicheck.sh
+++ b/gobject/abicheck.sh
@@ -1,5 +1,13 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX ${srcdir:-.}/gobject.symbols | sed -e '/^$/d' -e 's/ PRIVATE$//' | sort > expected-abi
-nm -D .libs/libgobject-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
+egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glib/glibconfig.h" > glibconfig.cpp
+
+INCLUDES="-include ${top_builddir:-..}/config.h"
+INCLUDES="$INCLUDES -include glibconfig.cpp"
+
+cpp -DINCLUDE_VARIABLES -P $INCLUDES ${srcdir:-.}/gobject.symbols | sed -e '/^$/d' -e 's/ PRIVATE$//' | sort > expected-abi
+rm glibconfig.cpp
+
+nm -D -g --defined-only .libs/libgobject-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
+
 diff -u expected-abi actual-abi && rm expected-abi actual-abi