diff --git a/ChangeLog b/ChangeLog index 1e9a8dde1d..7a51226be5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-06-15 Matthias Clasen + + * gdk/abicheck.sh: Use uniq to filter out duplicates. + * gdk/gdk.symbols: Fix a define. + 2005-06-14 Matthias Clasen * gtk/gtkwindow.c (gtk_window_parse_geometry): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1e9a8dde1d..7a51226be5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-06-15 Matthias Clasen + + * gdk/abicheck.sh: Use uniq to filter out duplicates. + * gdk/gdk.symbols: Fix a define. + 2005-06-14 Matthias Clasen * gtk/gtkwindow.c (gtk_window_parse_geometry): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1e9a8dde1d..7a51226be5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-06-15 Matthias Clasen + + * gdk/abicheck.sh: Use uniq to filter out duplicates. + * gdk/gdk.symbols: Fix a define. + 2005-06-14 Matthias Clasen * gtk/gtkwindow.c (gtk_window_parse_geometry): diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh index c03f9302ba..9164f1d3ea 100755 --- 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 > expected-abi +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 diff -u expected-abi actual-abi && rm expected-abi actual-abi diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index 73fc0bd396..5f5b1c0161 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -612,7 +612,7 @@ gdk_gc_get_screen #if IN_HEADER(__GDK_PIXMAP_X11_H__) #if IN_FILE(__GDK_PIXMAP_X11_C__) -#ifdef GDK_PIXMAPING_X11 +#ifdef GDK_WINDOWING_X11 gdk_pixmap_impl_x11_get_type G_GNUC_CONST #endif #endif