Commit 3612aee5 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Add hidden aliases for exported symbols which are used internally in order

Mon Aug  9 12:48:04 2004  Matthias Clasen  <maclas@gmx.de>

	Add hidden aliases for exported symbols which are
	used internally in order to get rid of many PLT
	entries.  (#145519, Arjan van de Ven)

	* gtk/Makefile.am: Add rules to generate gtk.def and
	from gtk.symbols, and make make check check the abi
	with abicheck.sh.
	(gtk_private_h_sources): Add gtkinternals.h
	(gtk_built_private_headers): Add gtkalias.h
	(gtk_extra_sources): Add gtk.symbols
	(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh

	* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
	The file can be processed by cpp to filter out certain
	subsets of symbols.

	* gtk/abicheck.sh: New file. Script to check the actually
	symbols exported from libgtk-x11.2.0.so against the symbols
	found in gtk.symbols.

	* gtk/makegtkalias.pl: New file. Perl script to generate the
	header containing the alias definitions for internally used
	exported symbols from a list of symbols.

	* gtk/gtkinternals.h: New file. An uninstalled header listing
	symbols which must be exported for some reason and do not appear
	in any other header.

	* gtk/*.c: Include gtkalias.h
parent 23e35417
Mon Aug 9 12:48:04 2004 Matthias Clasen <maclas@gmx.de>
Add hidden aliases for exported symbols which are
used internally in order to get rid of many PLT
entries. (#145519, Arjan van de Ven)
* gtk/Makefile.am: Add rules to generate gtk.def and
from gtk.symbols, and make make check check the abi
with abicheck.sh.
(gtk_private_h_sources): Add gtkinternals.h
(gtk_built_private_headers): Add gtkalias.h
(gtk_extra_sources): Add gtk.symbols
(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
The file can be processed by cpp to filter out certain
subsets of symbols.
* gtk/abicheck.sh: New file. Script to check the actually
symbols exported from libgtk-x11.2.0.so against the symbols
found in gtk.symbols.
* gtk/makegtkalias.pl: New file. Perl script to generate the
header containing the alias definitions for internally used
exported symbols from a list of symbols.
* gtk/gtkinternals.h: New file. An uninstalled header listing
symbols which must be exported for some reason and do not appear
in any other header.
* gtk/*.c: Include gtkalias.h
Mon Aug 9 11:49:46 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.
......
Mon Aug 9 12:48:04 2004 Matthias Clasen <maclas@gmx.de>
Add hidden aliases for exported symbols which are
used internally in order to get rid of many PLT
entries. (#145519, Arjan van de Ven)
* gtk/Makefile.am: Add rules to generate gtk.def and
from gtk.symbols, and make make check check the abi
with abicheck.sh.
(gtk_private_h_sources): Add gtkinternals.h
(gtk_built_private_headers): Add gtkalias.h
(gtk_extra_sources): Add gtk.symbols
(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
The file can be processed by cpp to filter out certain
subsets of symbols.
* gtk/abicheck.sh: New file. Script to check the actually
symbols exported from libgtk-x11.2.0.so against the symbols
found in gtk.symbols.
* gtk/makegtkalias.pl: New file. Perl script to generate the
header containing the alias definitions for internally used
exported symbols from a list of symbols.
* gtk/gtkinternals.h: New file. An uninstalled header listing
symbols which must be exported for some reason and do not appear
in any other header.
* gtk/*.c: Include gtkalias.h
Mon Aug 9 11:49:46 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.
......
Mon Aug 9 12:48:04 2004 Matthias Clasen <maclas@gmx.de>
Add hidden aliases for exported symbols which are
used internally in order to get rid of many PLT
entries. (#145519, Arjan van de Ven)
* gtk/Makefile.am: Add rules to generate gtk.def and
from gtk.symbols, and make make check check the abi
with abicheck.sh.
(gtk_private_h_sources): Add gtkinternals.h
(gtk_built_private_headers): Add gtkalias.h
(gtk_extra_sources): Add gtk.symbols
(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
The file can be processed by cpp to filter out certain
subsets of symbols.
* gtk/abicheck.sh: New file. Script to check the actually
symbols exported from libgtk-x11.2.0.so against the symbols
found in gtk.symbols.
* gtk/makegtkalias.pl: New file. Perl script to generate the
header containing the alias definitions for internally used
exported symbols from a list of symbols.
* gtk/gtkinternals.h: New file. An uninstalled header listing
symbols which must be exported for some reason and do not appear
in any other header.
* gtk/*.c: Include gtkalias.h
Mon Aug 9 11:49:46 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.
......
Mon Aug 9 12:48:04 2004 Matthias Clasen <maclas@gmx.de>
Add hidden aliases for exported symbols which are
used internally in order to get rid of many PLT
entries. (#145519, Arjan van de Ven)
* gtk/Makefile.am: Add rules to generate gtk.def and
from gtk.symbols, and make make check check the abi
with abicheck.sh.
(gtk_private_h_sources): Add gtkinternals.h
(gtk_built_private_headers): Add gtkalias.h
(gtk_extra_sources): Add gtk.symbols
(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
The file can be processed by cpp to filter out certain
subsets of symbols.
* gtk/abicheck.sh: New file. Script to check the actually
symbols exported from libgtk-x11.2.0.so against the symbols
found in gtk.symbols.
* gtk/makegtkalias.pl: New file. Perl script to generate the
header containing the alias definitions for internally used
exported symbols from a list of symbols.
* gtk/gtkinternals.h: New file. An uninstalled header listing
symbols which must be exported for some reason and do not appear
in any other header.
* gtk/*.c: Include gtkalias.h
Mon Aug 9 11:49:46 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.
......
......@@ -70,6 +70,16 @@ install-ms-lib:
uninstall-ms-lib:
endif
gtk.def: gtk.symbols
(echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gtk.def
gtkalias.h: gtk.symbols
cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DINCLUDE_INTERNAL_SYMBOLS gtk.symbols | ./makegtkalias.pl > gtkalias.h
if OS_UNIX
TEST = abicheck.sh
endif
# libtool stuff: set version and export symbols for resolving
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
# we use the general approach here
......@@ -284,6 +294,7 @@ gtk_private_h_sources = \
gtkfilechooserutils.h \
gtkfilesystemunix.h \
gtkfilesystemmodel.h \
gtkinternals.h \
gtkpathbar.h \
gtkrbtree.h \
gtktextbtree.h \
......@@ -523,10 +534,11 @@ gtk_built_public_sources = \
gtkmarshal.h \
gtktypebuiltins.h
# built sources that don't get installed
gtk_built_private_headers = \
gtkalias.h \
gtkmarshalers.h
# built sources that don't get installed
gtk_built_sources = \
gtktypebuiltins.c \
gtkmarshalers.c \
......@@ -544,6 +556,7 @@ stamp_files = \
# that don't serve as direct make target sources, i.e. they don't have
# their own .lo rules and don't get publically installed
gtk_extra_sources = \
gtk.symbols \
gtkversion.h.in \
gtkmarshalers.list \
gtkmarshal.list
......@@ -610,7 +623,7 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
&& echo timestamp > $(@F)
gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
( cd $(srcdir) && glib-mkenums \
--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtkalias.h\"\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
......@@ -711,7 +724,9 @@ EXTRA_DIST += \
gtkrc.key.default \
gtkrc.key.emacs \
makefile.msc \
makefile.msc.in
makefile.msc.in \
makegtkalias.pl \
abicheck.sh
install-data-local:
#! /bin/sh
cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DINCLUDE_INTERNAL_SYMBOLS gtk.symbols | sed -e '/^$/d' | sort > expected-abi
nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -c12- | grep "^gtk" | sort > actual-abi
diff -u expected-abi actual-abi
......@@ -41,6 +41,8 @@
#define _GNU_SOURCE
#endif
#include "gtkalias.h"
static gunichar
get_char (const char **str)
{
......
This diff is collapsed.
This diff is collapsed.
......@@ -31,8 +31,10 @@
#include <config.h>
#include <gdk/gdkkeysyms.h>
#include "gtkaboutdialog.h"
#include "gtkalias.h"
#include "gtkaboutdialog.h"
#include "gtkbutton.h"
#include "gtkbbox.h"
#include "gtkdialog.h"
......
......@@ -28,6 +28,7 @@
#include <string.h>
#include <stdlib.h>
#include "gtkalias.h"
#include "gtkaccelgroup.h"
#include "gtkaccelmap.h"
#include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */
......
......@@ -30,6 +30,7 @@
#include <config.h>
#include <string.h>
#include "gtkalias.h"
#include "gtkaccellabel.h"
#include "gtkaccelmap.h"
#include "gtkmain.h"
......
......@@ -19,6 +19,7 @@
#include <config.h>
#include "gtkalias.h"
#include "gtkaccelmap.h"
#include "gtkmarshalers.h"
......
......@@ -20,6 +20,7 @@
#include <config.h>
#include <string.h>
#include "gtkalias.h"
#include "gtkwidget.h"
#include "gtkaccessible.h"
......
......@@ -30,6 +30,7 @@
#include <config.h>
#include "gtkalias.h"
#include "gtkaction.h"
#include "gtkactiongroup.h"
#include "gtkaccellabel.h"
......
......@@ -30,6 +30,7 @@
#include <config.h>
#include "gtkalias.h"
#include "gtkactiongroup.h"
#include "gtkstock.h"
#include "gtktoggleaction.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkalignment.h"
#include "gtkintl.h"
......
......@@ -26,6 +26,7 @@
#include <config.h>
#include <math.h>
#include "gtkalias.h"
#include "gtkarrow.h"
#include "gtkintl.h"
......
......@@ -30,6 +30,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkaspectframe.h"
#include "gtkintl.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkbbox.h"
#include "gtkintl.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkbin.h"
......
......@@ -31,6 +31,7 @@
#include <string.h>
#include <stdarg.h>
#include <gdkkeysyms.h>
#include "gtkalias.h"
#include "gtkbindings.h"
#include "gtkkeyhash.h"
#include "gtkwidget.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkbox.h"
#include "gtkintl.h"
......
......@@ -26,6 +26,7 @@
#include <config.h>
#include <string.h>
#include "gtkalias.h"
#include "gtkalignment.h"
#include "gtkbutton.h"
#include "gtklabel.h"
......
......@@ -39,6 +39,7 @@
#include <time.h>
#include <glib/gprintf.h>
#include "gtkalias.h"
#include "gtkcalendar.h"
#include "gtkdnd.h"
#include "gtkintl.h"
......
......@@ -19,6 +19,7 @@
#include <config.h>
#include "gtkalias.h"
#include "gtkcelleditable.h"
#include "gtkmarshalers.h"
......
......@@ -18,6 +18,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkcelllayout.h"
GType
......
......@@ -18,6 +18,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkcellrenderer.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
......
......@@ -20,6 +20,7 @@
#include <config.h>
#include <string.h>
#include "gtkalias.h"
#include "gtkintl.h"
#include "gtkbin.h"
#include "gtkentry.h"
......
......@@ -19,6 +19,7 @@
#include <config.h>
#include <stdlib.h>
#include "gtkalias.h"
#include "gtkcellrendererpixbuf.h"
#include "gtkiconfactory.h"
#include "gtkintl.h"
......
......@@ -27,6 +27,8 @@
#include "config.h"
#include <stdlib.h>
#include "gtkalias.h"
#include "gtkcellrendererprogress.h"
#include "gtkintl.h"
......
......@@ -19,6 +19,7 @@
#include <config.h>
#include <stdlib.h>
#include "gtkalias.h"
#include "gtkcellrenderertext.h"
#include "gtkeditable.h"
#include "gtkentry.h"
......
......@@ -19,6 +19,7 @@
#include <config.h>
#include <stdlib.h>
#include "gtkalias.h"
#include "gtkcellrenderertoggle.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
......
......@@ -18,6 +18,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkcellview.h"
#include "gtkcelllayout.h"
#include "gtkintl.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkcheckbutton.h"
#include "gtkintl.h"
#include "gtklabel.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkcheckmenuitem.h"
#include "gtkaccellabel.h"
#include "gtkintl.h"
......
......@@ -22,6 +22,7 @@
#include <config.h>
#include <string.h>
#include "gtkalias.h"
#include "gtkclipboard.h"
#include "gtkinvisible.h"
#include "gtkmain.h"
......
......@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <string.h>
#include "gtkalias.h"
#include "gtkmain.h"
#include "gtkclist.h"
#include "gtkbindings.h"
......
......@@ -30,6 +30,7 @@
#include <config.h>
#include "gtkalias.h"
#include "gtkcolorbutton.h"
#include "gdk/gdkkeysyms.h"
#include "gdk-pixbuf/gdk-pixbuf.h"
......
......@@ -29,6 +29,7 @@
#include "gdkconfig.h"
#include <math.h>
#include "gtkalias.h"
#include "gdk/gdkkeysyms.h"
#include "gtkcolorsel.h"
#include "gtkhsv.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include <glib.h>
#include "gtkalias.h"
#include "gtkcolorseldialog.h"
#include "gtkframe.h"
#include "gtkhbbox.h"
......
......@@ -33,6 +33,7 @@
#include <config.h>
#include <string.h>
#include "gtkalias.h"
#include "gtkarrow.h"
#include "gtklabel.h"
#include "gtklist.h"
......
......@@ -18,6 +18,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkcombobox.h"
#include "gtkarrow.h"
......
......@@ -18,6 +18,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkcomboboxentry.h"
#include "gtkcelllayout.h"
......
......@@ -29,6 +29,7 @@
#include <string.h>
#include <stdlib.h>
#include "gtkalias.h"
#include "gtkcontainer.h"
#include "gtkprivate.h"
#include "gtkmain.h"
......
......@@ -33,6 +33,7 @@
#include <config.h>
#include <stdlib.h>
#include "gtkalias.h"
#include "gtkctree.h"
#include "gtkbindings.h"
#include "gtkmain.h"
......
......@@ -29,6 +29,7 @@
#include <string.h>
#include <math.h>
#include "gtkalias.h"
#include "gtkcurve.h"
#include "gtkdrawingarea.h"
#include "gtkmain.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkbutton.h"
#include "gtkdialog.h"
#include "gtkhbbox.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gdkconfig.h"
#include "gdk/gdkkeysyms.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkdrawingarea.h"
......
......@@ -27,6 +27,7 @@
#include <config.h>
#include <string.h>
#include "gtkalias.h"
#include "gtkeditable.h"
#include "gtkmarshalers.h"
......
......@@ -30,6 +30,7 @@
#include <pango/pango.h>
#include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
#include "gtkbindings.h"
#include "gtkcelleditable.h"
#include "gtkclipboard.h"
......@@ -4156,7 +4157,7 @@ gtk_entry_layout_index_to_text_index (GtkEntry *entry,
* @entry: a #GtkEntry
* @text_index: byte index into the entry contents
*
* Converts from a position in the entry's #PangoLayout(returned by
* Converts from a position in the entry's #PangoLayout (returned by
* gtk_entry_get_layout()) to a position in the entry contents
* (returned by gtk_entry_get_text()).
*
......
......@@ -18,6 +18,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkentrycompletion.h"
#include "gtkentryprivate.h"
#include "gtkcelllayout.h"
......
......@@ -25,6 +25,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkeventbox.h"
#include "gtkintl.h"
......
......@@ -23,6 +23,7 @@
#include <config.h>
#include "gtkalias.h"
#include "gtkexpander.h"
#include "gtklabel.h"
......
......@@ -19,6 +19,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkfilechooser.h"
#include "gtkfilechooserprivate.h"
#include "gtkfilesystem.h"
......
......@@ -20,6 +20,7 @@
#include <config.h>
#include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
#include "gtkalignment.h"
#include "gtkbindings.h"
#include "gtkbutton.h"
......
......@@ -19,6 +19,7 @@
*/
#include <config.h>
#include "gtkalias.h"
#include "gtkfilechooserdialog.h"
#include "gtkfilechooserwidget.h"
#include "gtkfilechooserutils.h"
......
#include <config.h>
#include "gtkalias.h"
#include "gtkfilechooserembed.h"