Tighten up ABI checking a bit

diff --git a/ChangeLog b/ChangeLog
index 661c24841595d48e466aa1030eccff35669e281c..f52c2e394edcbb9fa76983412667191b16188e82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/gdk.symbols: Add the gdk_display variable.
+
+       * gdk/abicheck.sh:
        * gtk/abicheck.sh: Also check exported variables.
 
 Fri Aug  5 16:54:19 2005  Søren Sandmann  <sandmann@redhat.com>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 661c24841595d48e466aa1030eccff35669e281c..f52c2e394edcbb9fa76983412667191b16188e82 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-08-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/gdk.symbols: Add the gdk_display variable.
+
+       * gdk/abicheck.sh:
        * gtk/abicheck.sh: Also check exported variables.
 
 Fri Aug  5 16:54:19 2005  Søren Sandmann  <sandmann@redhat.com>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 661c24841595d48e466aa1030eccff35669e281c..f52c2e394edcbb9fa76983412667191b16188e82 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-08-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/gdk.symbols: Add the gdk_display variable.
+
+       * gdk/abicheck.sh:
        * gtk/abicheck.sh: Also check exported variables.
 
 Fri Aug  5 16:54:19 2005  Søren Sandmann  <sandmann@redhat.com>

diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index 9164f1d3ea69d8d7010aaf33f2a8d8dcc5caf53b..8375923e40e5e659d11459ddcd74e86be40d0a43 100755 (executable)
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
-nm -D .libs/libgdk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
+cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
+nm -D .libs/libgdk-x11-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 97f2522ece9a4638f0bcadc52d062d6361193325..fe1fab56d897140bb36e0f8ac8719fbe74eb257e 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -1195,4 +1195,7 @@ gdk_xid_table_lookup_for_display
 gdk_threads_mutex
 gdk_threads_lock
 gdk_threads_unlock
+#ifdef GDK_WINDOWING_X11
+gdk_display
+#endif
 #endif