AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Re-add some conditionals to symbols files

Browse Source 
We need to keep the ifdefs for platform abi differences.
This commit is contained in:
Matthias Clasen 2010-11-29 12:47:44 -05:00
parent 6b5221380e
commit 670dfdb7cc
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdk.symbols
View File

@ -373,6 +373,7 @@ gdk_visual_get_system
gdk_visual_get_type G_GNUC_CONST gdk_visual_get_type G_GNUC_CONST
gdk_visual_get_visual_type gdk_visual_get_visual_type
gdk_visual_type_get_type G_GNUC_CONST gdk_visual_type_get_type G_GNUC_CONST
#ifdef GDK_WINDOWING_WIN32
gdk_win32_drawable_get_handle gdk_win32_drawable_get_handle
gdk_win32_handle_table_lookup gdk_win32_handle_table_lookup
gdk_win32_icon_to_pixbuf_libgtk_only gdk_win32_icon_to_pixbuf_libgtk_only
@ -380,6 +381,7 @@ gdk_win32_pixbuf_to_hicon_libgtk_only
gdk_win32_selection_add_targets gdk_win32_selection_add_targets
gdk_win32_set_modal_dialog_libgtk_only gdk_win32_set_modal_dialog_libgtk_only
gdk_win32_window_is_win32 gdk_win32_window_is_win32
#endif
gdk_window_add_filter gdk_window_add_filter
gdk_window_at_pointer gdk_window_at_pointer
gdk_window_attributes_type_get_type G_GNUC_CONST gdk_window_attributes_type_get_type G_GNUC_CONST

2
gtk/abicheck.sh
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi cpp -P -DG_OS_UNIX -DGDK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
nm -D -g --defined-only .libs/libgtk-x11-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi nm -D -g --defined-only .libs/libgtk-x11-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
diff -u expected-abi actual-abi && rm -f expected-abi actual-abi diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

8
gtk/gtk.symbols
View File

@ -1200,9 +1200,11 @@ gtk_info_bar_set_default_response
gtk_info_bar_set_message_type gtk_info_bar_set_message_type
gtk_info_bar_set_response_sensitive gtk_info_bar_set_response_sensitive
gtk_init gtk_init
gtk_init_abi_check
gtk_init_check gtk_init_check
#ifdef GDK_WINDOWING_WIN32
gtk_init_abi_check
gtk_init_check_abi_check gtk_init_check_abi_check
#endif
gtk_init_with_args gtk_init_with_args
gtk_invisible_get_screen gtk_invisible_get_screen
gtk_invisible_get_type G_GNUC_CONST gtk_invisible_get_type G_GNUC_CONST
@ -1794,10 +1796,12 @@ gtk_print_unix_dialog_set_manual_capabilities
gtk_print_unix_dialog_set_page_setup gtk_print_unix_dialog_set_page_setup
gtk_print_unix_dialog_set_settings gtk_print_unix_dialog_set_settings
gtk_print_unix_dialog_set_support_selection gtk_print_unix_dialog_set_support_selection
#ifdef GDK_WINDOWING_WIN32
gtk_print_win32_devnames_free gtk_print_win32_devnames_free
gtk_print_win32_devnames_from_printer_name gtk_print_win32_devnames_from_printer_name
gtk_print_win32_devnames_from_win32 gtk_print_win32_devnames_from_win32
gtk_print_win32_devnames_to_win32 gtk_print_win32_devnames_to_win32
#endif
gtk_progress_bar_get_ellipsize gtk_progress_bar_get_ellipsize
gtk_progress_bar_get_fraction gtk_progress_bar_get_fraction
gtk_progress_bar_get_inverted gtk_progress_bar_get_inverted
@ -3314,7 +3318,9 @@ gtk_widget_trigger_tooltip_query
gtk_widget_unmap gtk_widget_unmap
gtk_widget_unparent gtk_widget_unparent
gtk_widget_unrealize gtk_widget_unrealize
#ifdef GDK_WINDOWING_WIN32
gtk_win32_embed_widget_get_type G_GNUC_CONST gtk_win32_embed_widget_get_type G_GNUC_CONST
#endif
gtk_window_activate_default gtk_window_activate_default
gtk_window_activate_focus gtk_window_activate_focus
gtk_window_activate_key gtk_window_activate_key