From b5056fbaf90829e2190458447d9c0f31e0179dc3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 23 May 2011 00:21:06 -0400 Subject: [PATCH] Simply symbols files The grouping in files/headers is not used anymore, and the function attributes neither. Adapt abicheck scripts and .def file generation rules accordingly. --- gio/abicheck.sh | 4 +- gio/gio.symbols | 1011 +++++++-------------------------------- glib/Makefile.am | 2 +- glib/abicheck.sh | 2 +- glib/glib.symbols | 781 +++++++----------------------- gobject/abicheck.sh | 2 +- gobject/gobject.symbols | 147 +----- 7 files changed, 352 insertions(+), 1597 deletions(-) diff --git a/gio/abicheck.sh b/gio/abicheck.sh index 2f76d7b53..ad3b100f8 100755 --- a/gio/abicheck.sh +++ b/gio/abicheck.sh @@ -5,9 +5,9 @@ egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glib/glibconfig.h" > glibconfig. INCLUDES="-include ${top_builddir:-..}/config.h" INCLUDES="$INCLUDES -include glibconfig.cpp" -cpp -DINCLUDE_VARIABLES -P $INCLUDES -DALL_FILES ${srcdir:-.}/gio.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi +cpp -P $INCLUDES ${srcdir:-.}/gio.symbols | sed -e '/^$/d' -e 's/ PRIVATE$//' | sort > expected-abi rm glibconfig.cpp nm -D -g --defined-only .libs/libgio-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 +diff -u expected-abi actual-abi #&& rm expected-abi actual-abi diff --git a/gio/gio.symbols b/gio/gio.symbols index 176666d18..69d5eaad5 100644 --- a/gio/gio.symbols +++ b/gio/gio.symbols @@ -1,19 +1,8 @@ /* This file lists all exported symbols. It is used to generate * the gio.def file used to control exports on Windows. - * - * Every symbol must be included in the right - * #ifdef IN_HEADER(sym) #endif and - * #ifdef IN_FILE(sym) #endif sections. */ -#ifdef ALL_FILES -#define IN_FILE(x) 1 -#define IN_HEADER(x) 1 -#endif - -#if IN_HEADER(__G_VFS_H__) -#if IN_FILE(__G_VFS_C__) -g_vfs_get_type G_GNUC_CONST +g_vfs_get_type g_vfs_is_active g_vfs_get_file_for_path g_vfs_get_file_for_uri @@ -21,12 +10,7 @@ g_vfs_get_supported_uri_schemes g_vfs_parse_name g_vfs_get_default g_vfs_get_local -#endif -#endif - -#if IN_HEADER(__G_APPLICATION_H__) -#if IN_FILE(__G_APPLICATION_C__) -g_application_get_type G_GNUC_CONST +g_application_get_type g_application_activate g_application_flags_get_type g_application_get_application_id @@ -45,11 +29,6 @@ g_application_set_action_group g_application_set_application_id g_application_set_flags g_application_set_inactivity_timeout -#endif -#endif - -#if IN_HEADER(__G_APPLICATION_COMMAND_LINE_H__) -#if IN_FILE(__G_APPLICATION_COMMAND_LINE_C__) g_application_command_line_get_arguments g_application_command_line_get_cwd g_application_command_line_get_environ @@ -61,13 +40,8 @@ g_application_command_line_get_type g_application_command_line_print g_application_command_line_printerr g_application_command_line_set_exit_status -#endif -#endif - -#if IN_HEADER(__G_APP_INFO_H__) -#if IN_FILE(__G_APP_INFO_C__) -g_app_info_get_type G_GNUC_CONST -g_app_launch_context_get_type G_GNUC_CONST +g_app_info_get_type +g_app_launch_context_get_type g_app_info_dup g_app_info_equal g_app_info_get_id @@ -95,9 +69,6 @@ g_app_launch_context_new g_app_launch_context_get_display g_app_launch_context_get_startup_notify_id g_app_launch_context_launch_failed -#endif - -#if IN_FILE(__G_DESKTOP_APP_INFO_C__) #ifdef G_OS_UNIX g_app_info_create_from_commandline g_app_info_get_all @@ -108,11 +79,6 @@ g_app_info_get_fallback_for_type g_app_info_get_recommended_for_type g_app_info_reset_type_associations #endif -#endif -#endif - - -#if IN_FILE(__G_WIN32_APP_INFO_C__) #ifdef G_OS_WIN32 g_app_info_create_from_commandline g_app_info_get_all @@ -123,11 +89,6 @@ g_app_info_get_fallback_for_type g_app_info_get_recommended_for_type g_app_info_reset_type_associations #endif -#endif - - -#if IN_HEADER(__G_DESKTOP_APP_INFO_H__) -#if IN_FILE(__G_DESKTOP_APP_INFO_C__) #ifdef G_OS_UNIX g_desktop_app_info_new_from_filename g_desktop_app_info_new_from_keyfile @@ -136,27 +97,16 @@ g_desktop_app_info_get_categories g_desktop_app_info_get_filename g_desktop_app_info_get_generic_name g_desktop_app_info_get_is_hidden -g_desktop_app_info_get_type G_GNUC_CONST +g_desktop_app_info_get_type g_desktop_app_info_launch_uris_as_manager -g_desktop_app_info_lookup_get_type G_GNUC_CONST +g_desktop_app_info_lookup_get_type g_desktop_app_info_lookup_get_default_for_uri_scheme g_desktop_app_info_set_desktop_env #endif -#endif -#endif - - -#if IN_HEADER(__G_ASYNC_RESULT_H__) -#if IN_FILE(__G_ASYNC_RESULT_C__) -g_async_result_get_type G_GNUC_CONST +g_async_result_get_type g_async_result_get_user_data g_async_result_get_source_object -#endif -#endif - -#if IN_HEADER(__G_BUFFERED_INPUT_STREAM_H__) -#if IN_FILE(__G_BUFFERED_INPUT_STREAM_C__) -g_buffered_input_stream_get_type G_GNUC_CONST +g_buffered_input_stream_get_type g_buffered_input_stream_new g_buffered_input_stream_new_sized g_buffered_input_stream_get_buffer_size @@ -168,24 +118,14 @@ g_buffered_input_stream_fill g_buffered_input_stream_fill_async g_buffered_input_stream_fill_finish g_buffered_input_stream_read_byte -#endif -#endif - -#if IN_HEADER(__G_BUFFERED_OUTPUT_STREAM_H__) -#if IN_FILE(__G_BUFFERED_OUTPUT_STREAM_C__) -g_buffered_output_stream_get_type G_GNUC_CONST; +g_buffered_output_stream_get_type g_buffered_output_stream_new g_buffered_output_stream_new_sized g_buffered_output_stream_get_buffer_size g_buffered_output_stream_set_buffer_size g_buffered_output_stream_get_auto_grow g_buffered_output_stream_set_auto_grow -#endif -#endif - -#if IN_HEADER(__G_CANCELLABLE_H__) -#if IN_FILE(__G_CANCELLABLE_C__) -g_cancellable_get_type G_GNUC_CONST +g_cancellable_get_type g_cancellable_new g_cancellable_is_cancelled g_cancellable_set_error_if_cancelled @@ -200,11 +140,6 @@ g_cancellable_cancel g_cancellable_connect g_cancellable_disconnect g_cancellable_source_new -#endif -#endif - -#if IN_HEADER(__G_CONTENT_TYPE_H__) -#if IN_FILE(__G_CONTENT_TYPE_C__) g_content_type_equals g_content_type_is_a g_content_type_is_unknown @@ -216,46 +151,21 @@ g_content_type_from_mime_type g_content_type_guess g_content_type_guess_for_tree g_content_types_get_registered -#endif -#endif - -#if IN_HEADER(__G_CONVERTER_H__) -#if IN_FILE(__G_CONVERTER_C__) -g_converter_get_type G_GNUC_CONST +g_converter_get_type g_converter_reset g_converter_convert -#endif -#endif - -#if IN_HEADER(__G_CONVERTER_INPUT_STREAM_H__) -#if IN_FILE(__G_CONVERTER_INPUT_STREAM_C__) g_converter_input_stream_get_type g_converter_input_stream_new g_converter_input_stream_get_converter -#endif -#endif - -#if IN_HEADER(__G_CONVERTER_OUTPUT_STREAM_H__) -#if IN_FILE(__G_CONVERTER_OUTPUT_STREAM_C__) g_converter_output_stream_get_type g_converter_output_stream_new g_converter_output_stream_get_converter -#endif -#endif - -#if IN_HEADER(__G_CHARSET_CONVERTER_H__) -#if IN_FILE(__G_CHARSET_CONVERTER_C__) g_charset_converter_get_type g_charset_converter_new g_charset_converter_get_num_fallbacks g_charset_converter_get_use_fallback g_charset_converter_set_use_fallback -#endif -#endif - -#if IN_HEADER(__G_DATA_INPUT_STREAM_H__) -#if IN_FILE(__G_DATA_INPUT_STREAM_C__) -g_data_input_stream_get_type G_GNUC_CONST +g_data_input_stream_get_type g_data_input_stream_new g_data_input_stream_set_byte_order g_data_input_stream_get_byte_order @@ -277,12 +187,7 @@ g_data_input_stream_read_until_finish g_data_input_stream_read_upto g_data_input_stream_read_upto_async g_data_input_stream_read_upto_finish -#endif -#endif - -#if IN_HEADER(__G_DATA_OUTPUT_STREAM_H__) -#if IN_FILE(__G_DATA_OUTPUT_STREAM_C__) -g_data_output_stream_get_type G_GNUC_CONST +g_data_output_stream_get_type g_data_output_stream_new g_data_output_stream_set_byte_order g_data_output_stream_get_byte_order @@ -294,12 +199,7 @@ g_data_output_stream_put_uint32 g_data_output_stream_put_int64 g_data_output_stream_put_uint64 g_data_output_stream_put_string -#endif -#endif - -#if IN_HEADER(__G_DRIVE_H__) -#if IN_FILE(__G_DRIVE_C__) -g_drive_get_type G_GNUC_CONST +g_drive_get_type g_drive_get_name g_drive_get_icon g_drive_has_volumes @@ -323,28 +223,16 @@ g_drive_start_finish g_drive_can_stop g_drive_stop g_drive_stop_finish -#ifndef G_DISABLE_DEPRECATED g_drive_eject g_drive_eject_finish -#endif -#endif -#endif - -#if IN_HEADER(__G_FILE_ATTRIBUTE_H__) -#if IN_FILE(__G_FILE_ATTRIBUTE_C__) g_file_attribute_info_list_new g_file_attribute_info_list_ref g_file_attribute_info_list_unref g_file_attribute_info_list_dup -g_file_attribute_info_list_get_type G_GNUC_CONST +g_file_attribute_info_list_get_type g_file_attribute_info_list_lookup g_file_attribute_info_list_add -#endif -#endif - -#if IN_HEADER(__G_FILE_H__) -#if IN_FILE(__G_FILE_C__) -g_file_get_type G_GNUC_CONST +g_file_get_type g_file_new_for_path g_file_new_for_uri g_file_new_for_commandline_arg @@ -453,18 +341,11 @@ g_file_stop_mountable_finish g_file_supports_thread_contexts g_file_poll_mountable g_file_poll_mountable_finish -#ifndef G_DISABLE_DEPRECATED g_file_unmount_mountable g_file_unmount_mountable_finish g_file_eject_mountable g_file_eject_mountable_finish -#endif -#endif -#endif - -#if IN_HEADER(__G_FILE_ENUMERATOR_H__) -#if IN_FILE(__G_FILE_ENUMERATOR_C__) -g_file_enumerator_get_type G_GNUC_CONST +g_file_enumerator_get_type g_file_enumerator_next_file g_file_enumerator_close g_file_enumerator_next_files_async @@ -475,20 +356,10 @@ g_file_enumerator_is_closed g_file_enumerator_has_pending g_file_enumerator_set_pending g_file_enumerator_get_container -#endif -#endif - -#if IN_HEADER(__G_FILE_ICON_H__) -#if IN_FILE(__G_FILE_ICON_C__) -g_file_icon_get_type G_GNUC_CONST +g_file_icon_get_type g_file_icon_new g_file_icon_get_file -#endif -#endif - -#if IN_HEADER(__G_FILE_INFO_H__) -#if IN_FILE(__G_FILE_INFO_C__) -g_file_info_get_type G_GNUC_CONST +g_file_info_get_type g_file_info_new g_file_info_dup g_file_info_copy_into @@ -549,7 +420,7 @@ g_file_info_set_size g_file_info_set_modification_time g_file_info_set_symlink_target g_file_info_set_sort_order -g_file_attribute_matcher_get_type G_GNUC_CONST +g_file_attribute_matcher_get_type g_file_attribute_matcher_new g_file_attribute_matcher_ref g_file_attribute_matcher_unref @@ -557,89 +428,44 @@ g_file_attribute_matcher_matches g_file_attribute_matcher_matches_only g_file_attribute_matcher_enumerate_namespace g_file_attribute_matcher_enumerate_next -#endif -#endif - -#if IN_HEADER(__G_FILE_INPUT_STREAM_H__) -#if IN_FILE(__G_FILE_INPUT_STREAM_C__) -g_file_input_stream_get_type G_GNUC_CONST +g_file_input_stream_get_type g_file_input_stream_query_info g_file_input_stream_query_info_async g_file_input_stream_query_info_finish -#endif -#endif - -#if IN_HEADER(__G_FILE_MONITOR_H__) -#if IN_FILE(__G_FILE_MONITOR_C__) -g_file_monitor_get_type G_GNUC_CONST +g_file_monitor_get_type g_file_monitor_cancel g_file_monitor_is_cancelled g_file_monitor_set_rate_limit g_file_monitor_emit_event -#endif -#endif - -#if IN_HEADER(__G_FILENAME_COMPLETER_H__) -#if IN_FILE(__G_FILENAME_COMPLETER_C__) -g_filename_completer_get_type G_GNUC_CONST +g_filename_completer_get_type g_filename_completer_new g_filename_completer_get_completion_suffix g_filename_completer_get_completions g_filename_completer_set_dirs_only -#endif -#endif - -#if IN_HEADER(__G_FILE_OUTPUT_STREAM_H__) -#if IN_FILE(__G_FILE_OUTPUT_STREAM_C__) -g_file_output_stream_get_type G_GNUC_CONST +g_file_output_stream_get_type g_file_output_stream_query_info g_file_output_stream_query_info_async g_file_output_stream_query_info_finish g_file_output_stream_get_etag -#endif -#endif - -#if IN_HEADER(__G_FILE_IO_STREAM_H__) -#if IN_FILE(__G_FILE_IO_STREAM_C__) -g_file_io_stream_get_type G_GNUC_CONST +g_file_io_stream_get_type g_file_io_stream_query_info g_file_io_stream_query_info_async g_file_io_stream_query_info_finish g_file_io_stream_get_etag -#endif -#endif - -#if IN_HEADER(__G_FILTER_INPUT_STREAM_H__) -#if IN_FILE(__G_FILTER_INPUT_STREAM_C__) -g_filter_input_stream_get_type G_GNUC_CONST +g_filter_input_stream_get_type g_filter_input_stream_get_base_stream g_filter_input_stream_get_close_base_stream g_filter_input_stream_set_close_base_stream -#endif -#endif - -#if IN_HEADER(__G_FILTER_OUTPUT_STREAM_H__) -#if IN_FILE(__G_FILTER_OUTPUT_STREAM_C__) -g_filter_output_stream_get_type G_GNUC_CONST +g_filter_output_stream_get_type g_filter_output_stream_get_base_stream g_filter_output_stream_get_close_base_stream g_filter_output_stream_set_close_base_stream -#endif -#endif - -#if IN_HEADER(__G_ICON_H__) -#if IN_FILE(__G_ICON_C__) -g_icon_get_type G_GNUC_CONST +g_icon_get_type g_icon_hash g_icon_equal g_icon_to_string g_icon_new_for_string -#endif -#endif - -#if IN_HEADER(__G_INPUT_STREAM_H__) -#if IN_FILE(__G_INPUT_STREAM_C__) -g_input_stream_get_type G_GNUC_CONST +g_input_stream_get_type g_input_stream_read g_input_stream_read_all g_input_stream_skip @@ -654,12 +480,7 @@ g_input_stream_is_closed g_input_stream_has_pending g_input_stream_set_pending g_input_stream_clear_pending -#endif -#endif - -#if IN_HEADER(__G_IO_STREAM_H__) -#if IN_FILE(__G_IO_STREAM_C__) -g_io_stream_get_type G_GNUC_CONST +g_io_stream_get_type g_io_stream_get_input_stream g_io_stream_get_output_stream g_io_stream_close @@ -671,22 +492,12 @@ g_io_stream_set_pending g_io_stream_clear_pending g_io_stream_splice_async g_io_stream_splice_finish -#endif -#endif - -#if IN_HEADER(__G_IO_ERROR_H__) -#if IN_FILE(__G_IO_ERROR_C__) g_io_error_quark g_io_error_from_errno #ifdef G_OS_WIN32 g_io_error_from_win32_error #endif -#endif -#endif - -#if IN_HEADER(__G_IO_MODULE_H__) -#if IN_FILE(__G_IO_MODULE_C__) -g_io_module_get_type G_GNUC_CONST +g_io_module_get_type g_io_module_new g_io_modules_scan_all_in_directory g_io_modules_load_all_in_directory @@ -701,50 +512,25 @@ g_io_extension_get_type g_io_extension_get_name g_io_extension_get_priority g_io_extension_ref_class -#endif -#endif - -#if IN_HEADER(__G_IO_SCHEDULER_H__) -#if IN_FILE(__G_IO_SCHEDULER_C__) g_io_scheduler_push_job g_io_scheduler_cancel_all_jobs g_io_scheduler_job_send_to_mainloop g_io_scheduler_job_send_to_mainloop_async -#endif -#endif - -#if IN_HEADER(__G_LOADABLE_ICON_H__) -#if IN_FILE(__G_LOADABLE_ICON_C__) -g_loadable_icon_get_type G_GNUC_CONST +g_loadable_icon_get_type g_loadable_icon_load g_loadable_icon_load_async g_loadable_icon_load_finish -#endif -#endif - -#if IN_HEADER(__G_MEMORY_INPUT_STREAM_H__) -#if IN_FILE(__G_MEMORY_INPUT_STREAM_C__) -g_memory_input_stream_get_type G_GNUC_CONST +g_memory_input_stream_get_type g_memory_input_stream_new g_memory_input_stream_new_from_data g_memory_input_stream_add_data -#endif -#endif - -#if IN_HEADER(__G_MEMORY_OUTPUT_STREAM_H__) -#if IN_FILE(__G_MEMORY_OUTPUT_STREAM_C__) -g_memory_output_stream_get_type G_GNUC_CONST +g_memory_output_stream_get_type g_memory_output_stream_new g_memory_output_stream_get_data g_memory_output_stream_get_data_size g_memory_output_stream_get_size g_memory_output_stream_steal_data -#endif -#endif - -#if IN_HEADER(__G_MOUNT_OPERATION_H__) -#if IN_FILE(__G_MOUNT_OPERATION_C__) -g_mount_operation_get_type G_GNUC_CONST +g_mount_operation_get_type g_mount_operation_new g_mount_operation_get_username g_mount_operation_set_username @@ -759,12 +545,7 @@ g_mount_operation_set_password_save g_mount_operation_get_choice g_mount_operation_set_choice g_mount_operation_reply -#endif -#endif - -#if IN_HEADER(__G_OUTPUT_STREAM_H__) -#if IN_FILE(__G_OUTPUT_STREAM_C__) -g_output_stream_get_type G_GNUC_CONST +g_output_stream_get_type g_output_stream_write g_output_stream_write_all g_output_stream_splice @@ -783,23 +564,13 @@ g_output_stream_is_closing g_output_stream_has_pending g_output_stream_set_pending g_output_stream_clear_pending -#endif -#endif - -#if IN_HEADER(__G_SEEKABLE_H__) -#if IN_FILE(__G_SEEKABLE_C__) -g_seekable_get_type G_GNUC_CONST +g_seekable_get_type g_seekable_tell g_seekable_can_seek g_seekable_seek g_seekable_can_truncate g_seekable_truncate -#endif -#endif - -#if IN_HEADER(__G_SIMPLE_ASYNC_RESULT_H__) -#if IN_FILE(__G_SIMPLE_ASYNC_RESULT_C__) -g_simple_async_result_get_type G_GNUC_CONST +g_simple_async_result_get_type g_simple_async_result_new g_simple_async_result_new_error g_simple_async_result_new_from_error @@ -824,23 +595,13 @@ g_simple_async_result_is_valid g_simple_async_report_error_in_idle g_simple_async_report_gerror_in_idle g_simple_async_report_take_gerror_in_idle -#endif -#endif - -#if IN_HEADER(__G_THEMED_ICON_H__) -#if IN_FILE(__G_THEMED_ICON_C__) -g_themed_icon_get_type G_GNUC_CONST +g_themed_icon_get_type g_themed_icon_new g_themed_icon_new_with_default_fallbacks g_themed_icon_new_from_names g_themed_icon_get_names g_themed_icon_prepend_name g_themed_icon_append_name -#endif -#endif - -#if IN_HEADER(__G_UNIX_MOUNTS_H__) -#if IN_FILE(__G_UNIX_MOUNTS_C__) #ifdef G_OS_UNIX g_unix_mount_free g_unix_mount_point_free @@ -869,65 +630,40 @@ g_unix_mounts_get g_unix_mount_at g_unix_mounts_changed_since g_unix_mount_points_changed_since -g_unix_mount_monitor_get_type G_GNUC_CONST +g_unix_mount_monitor_get_type g_unix_mount_monitor_new g_unix_mount_monitor_set_rate_limit g_unix_is_mount_path_system_internal #endif /* G_OS_UNIX */ -#endif -#endif - -#if IN_HEADER(__G_UNIX_INPUT_STREAM_H__) -#if IN_FILE(__G_UNIX_INPUT_STREAM_C__) #ifdef G_OS_UNIX -g_unix_input_stream_get_type G_GNUC_CONST +g_unix_input_stream_get_type g_unix_input_stream_new g_unix_input_stream_set_close_fd g_unix_input_stream_get_close_fd g_unix_input_stream_get_fd #endif /* G_OS_UNIX */ -#endif -#endif - -#if IN_HEADER(__G_UNIX_OUTPUT_STREAM_H__) -#if IN_FILE(__G_UNIX_OUTPUT_STREAM_C__) #ifdef G_OS_UNIX -g_unix_output_stream_get_type G_GNUC_CONST +g_unix_output_stream_get_type g_unix_output_stream_new g_unix_output_stream_set_close_fd g_unix_output_stream_get_close_fd g_unix_output_stream_get_fd #endif /* G_OS_UNIX */ -#endif -#endif - -#if IN_HEADER(__G_WIN32_INPUT_STREAM_H__) -#if IN_FILE(__G_WIN32_INPUT_STREAM_C__) #ifdef G_OS_WIN32 -g_win32_input_stream_get_type G_GNUC_CONST +g_win32_input_stream_get_type g_win32_input_stream_new g_win32_input_stream_set_close_handle g_win32_input_stream_get_close_handle g_win32_input_stream_get_handle #endif /* G_OS_WIN32 */ -#endif -#endif - -#if IN_HEADER(__G_WIN32_OUTPUT_STREAM_H__) -#if IN_FILE(__G_WIN32_OUTPUT_STREAM_C__) #ifdef G_OS_WIN32 -g_win32_output_stream_get_type G_GNUC_CONST +g_win32_output_stream_get_type g_win32_output_stream_new g_win32_output_stream_set_close_handle g_win32_output_stream_get_close_handle g_win32_output_stream_get_handle #endif /* G_OS_WIN32 */ -#endif -#endif - -#if IN_HEADER(__G_MOUNT_H__) -#if IN_FILE(__G_MOUNT_C__) -g_mount_get_type G_GNUC_CONST +g_mount_get_type g_mount_get_root g_mount_get_name g_mount_get_icon @@ -949,18 +685,11 @@ g_mount_guess_content_type_sync g_mount_is_shadowed g_mount_shadow g_mount_unshadow -#ifndef G_DISABLE_DEPRECATED g_mount_unmount g_mount_unmount_finish g_mount_eject g_mount_eject_finish -#endif -#endif -#endif - -#if IN_HEADER(__G_VOLUME_H__) -#if IN_FILE(__G_VOLUME_C__) -g_volume_get_type G_GNUC_CONST +g_volume_get_type g_volume_get_name g_volume_get_icon g_volume_get_uuid @@ -976,142 +705,95 @@ g_volume_eject_with_operation_finish g_volume_get_identifier g_volume_enumerate_identifiers g_volume_get_activation_root -#ifndef G_DISABLE_DEPRECATED g_volume_eject g_volume_eject_finish -#endif -#endif -#endif - -#if IN_HEADER(__G_VOLUME_MONITOR_H__) -#if IN_FILE(__G_VOLUME_MONITOR_C__) -g_volume_monitor_get_type G_GNUC_CONST +g_volume_monitor_get_type g_volume_monitor_get_connected_drives g_volume_monitor_get_volume_for_uuid g_volume_monitor_get_volumes g_volume_monitor_get_mounts g_volume_monitor_get_mount_for_uuid -#endif -#if IN_FILE(__G_UNION_VOLUME_MONITOR_C__) g_volume_monitor_get -#ifndef G_DISABLE_DEPRECATED g_volume_monitor_adopt_orphan_mount -#endif -#endif -#endif - -#if IN_HEADER(__G_NATIVE_VOLUME_MONITOR_H__) -#if IN_FILE(__G_NATIVE_VOLUME_MONITOR_C__) -g_native_volume_monitor_get_type G_GNUC_CONST -#endif -#endif - -#if IN_HEADER(__G_LOCAL_FILE_MONITOR_H__) -#if IN_FILE(__G_LOCAL_FILE_MONITOR_C__) +g_native_volume_monitor_get_type #ifdef G_OS_UNIX -g_local_file_monitor_get_type G_GNUC_CONST +g_local_file_monitor_get_type #endif -#endif -#endif - -#if IN_HEADER(__G_LOCAL_DIRECTORY_MONITOR_H__) -#if IN_FILE(__G_LOCAL_DIRECTORY_MONITOR_C__) #ifdef G_OS_UNIX -g_local_directory_monitor_get_type G_GNUC_CONST +g_local_directory_monitor_get_type #endif -#endif -#endif - -#if IN_HEADER(__GIO_ENUM_TYPES_H__) -#if IN_FILE(__GIO_ENUM_TYPES_C__) -g_mount_unmount_flags_get_type G_GNUC_CONST -g_app_info_create_flags_get_type G_GNUC_CONST -g_converter_flags_get_type G_GNUC_CONST -g_converter_result_get_type G_GNUC_CONST -g_data_stream_byte_order_get_type G_GNUC_CONST -g_data_stream_newline_type_get_type G_GNUC_CONST -g_file_attribute_info_flags_get_type G_GNUC_CONST -g_file_attribute_status_get_type G_GNUC_CONST -g_file_attribute_type_get_type G_GNUC_CONST -g_file_copy_flags_get_type G_GNUC_CONST -g_file_create_flags_get_type G_GNUC_CONST -g_file_monitor_event_get_type G_GNUC_CONST -g_file_monitor_flags_get_type G_GNUC_CONST -g_file_query_info_flags_get_type G_GNUC_CONST -g_file_type_get_type G_GNUC_CONST -g_filesystem_preview_type_get_type G_GNUC_CONST -g_io_error_enum_get_type G_GNUC_CONST -g_io_stream_splice_flags_get_type G_GNUC_CONST -g_mount_mount_flags_get_type G_GNUC_CONST -g_mount_operation_result_get_type G_GNUC_CONST -g_drive_start_flags_get_type G_GNUC_CONST -g_drive_start_stop_type_get_type G_GNUC_CONST -g_output_stream_splice_flags_get_type G_GNUC_CONST -g_ask_password_flags_get_type G_GNUC_CONST -g_password_save_get_type G_GNUC_CONST -g_emblem_origin_get_type G_GNUC_CONST -g_socket_family_get_type G_GNUC_CONST -g_socket_type_get_type G_GNUC_CONST -g_socket_protocol_get_type G_GNUC_CONST -g_socket_msg_flags_get_type G_GNUC_CONST -g_unix_socket_address_type_get_type G_GNUC_CONST -g_resolver_error_get_type G_GNUC_CONST +g_mount_unmount_flags_get_type +g_app_info_create_flags_get_type +g_converter_flags_get_type +g_converter_result_get_type +g_data_stream_byte_order_get_type +g_data_stream_newline_type_get_type +g_file_attribute_info_flags_get_type +g_file_attribute_status_get_type +g_file_attribute_type_get_type +g_file_copy_flags_get_type +g_file_create_flags_get_type +g_file_monitor_event_get_type +g_file_monitor_flags_get_type +g_file_query_info_flags_get_type +g_file_type_get_type +g_filesystem_preview_type_get_type +g_io_error_enum_get_type +g_io_stream_splice_flags_get_type +g_mount_mount_flags_get_type +g_mount_operation_result_get_type +g_drive_start_flags_get_type +g_drive_start_stop_type_get_type +g_output_stream_splice_flags_get_type +g_ask_password_flags_get_type +g_password_save_get_type +g_emblem_origin_get_type +g_socket_family_get_type +g_socket_type_get_type +g_socket_protocol_get_type +g_socket_msg_flags_get_type +g_unix_socket_address_type_get_type +g_resolver_error_get_type g_zlib_compressor_format_get_type g_settings_bind_flags_get_type -g_dbus_error_get_type G_GNUC_CONST -g_bus_type_get_type G_GNUC_CONST -g_bus_name_owner_flags_get_type G_GNUC_CONST -g_bus_name_watcher_flags_get_type G_GNUC_CONST -g_dbus_proxy_flags_get_type G_GNUC_CONST -g_dbus_connection_flags_get_type G_GNUC_CONST -g_dbus_capability_flags_get_type G_GNUC_CONST -g_dbus_call_flags_get_type G_GNUC_CONST -g_dbus_message_type_get_type G_GNUC_CONST -g_dbus_message_flags_get_type G_GNUC_CONST -g_dbus_message_header_field_get_type G_GNUC_CONST -g_dbus_property_info_flags_get_type G_GNUC_CONST -g_dbus_subtree_flags_get_type G_GNUC_CONST -g_dbus_server_flags_get_type G_GNUC_CONST -g_dbus_signal_flags_get_type G_GNUC_CONST -g_dbus_send_message_flags_get_type G_GNUC_CONST -g_credentials_type_get_type G_GNUC_CONST -g_dbus_message_byte_order_get_type G_GNUC_CONST -g_tls_authentication_mode_get_type G_GNUC_CONST -g_tls_certificate_flags_get_type G_GNUC_CONST -g_tls_rehandshake_mode_get_type G_GNUC_CONST -#endif -#endif - - -#if IN_HEADER(__G_EMBLEMED_ICON_H__) -#if IN_FILE(__G_EMBLEMED_ICON_C__) -g_emblemed_icon_get_type G_GNUC_CONST +g_dbus_error_get_type +g_bus_type_get_type +g_bus_name_owner_flags_get_type +g_bus_name_watcher_flags_get_type +g_dbus_proxy_flags_get_type +g_dbus_connection_flags_get_type +g_dbus_capability_flags_get_type +g_dbus_call_flags_get_type +g_dbus_message_type_get_type +g_dbus_message_flags_get_type +g_dbus_message_header_field_get_type +g_dbus_property_info_flags_get_type +g_dbus_subtree_flags_get_type +g_dbus_server_flags_get_type +g_dbus_signal_flags_get_type +g_dbus_send_message_flags_get_type +g_credentials_type_get_type +g_dbus_message_byte_order_get_type +g_tls_authentication_mode_get_type +g_tls_certificate_flags_get_type +g_tls_rehandshake_mode_get_type +g_emblemed_icon_get_type g_emblemed_icon_new g_emblemed_icon_get_icon g_emblemed_icon_get_emblems g_emblemed_icon_add_emblem g_emblemed_icon_clear_emblems -#endif -#endif - -#if IN_HEADER(__G_EMBLEM_H__) -#if IN_FILE(__G_EMBLEM_C__) -g_emblem_get_type G_GNUC_CONST +g_emblem_get_type g_emblem_new g_emblem_new_with_origin g_emblem_get_icon g_emblem_get_origin -#endif -#endif - -#if IN_HEADER(__G_INET_ADDRESS_H__) -#if IN_FILE(__G_INET_ADDRESS_C__) g_inet_address_new_from_string g_inet_address_new_from_bytes g_inet_address_new_any g_inet_address_new_loopback g_inet_address_get_family -g_inet_address_get_type G_GNUC_CONST +g_inet_address_get_type g_inet_address_get_is_any g_inet_address_get_is_link_local g_inet_address_get_is_loopback @@ -1126,72 +808,38 @@ g_inet_address_to_bytes g_inet_address_get_native_size g_inet_address_to_string g_inet_address_equal -#endif -#endif - -#if IN_HEADER(__G_INET_SOCKET_ADDRESS_H__) -#if IN_FILE(__G_INET_SOCKET_ADDRESS_C__) g_inet_socket_address_get_address g_inet_socket_address_get_port -g_inet_socket_address_get_type G_GNUC_CONST +g_inet_socket_address_get_type g_inet_socket_address_new -#endif -#endif - -#if IN_HEADER(__G_UNIX_SOCKET_ADDRESS_H__) -#if IN_FILE(__G_UNIX_SOCKET_ADDRESS_C__) #ifdef G_OS_UNIX -g_unix_socket_address_get_type G_GNUC_CONST +g_unix_socket_address_get_type g_unix_socket_address_new -#ifndef G_DISABLE_DEPRECATED g_unix_socket_address_new_abstract -#endif g_unix_socket_address_new_with_type g_unix_socket_address_abstract_names_supported -#ifndef G_DISABLE_DEPRECATED g_unix_socket_address_get_is_abstract -#endif g_unix_socket_address_get_address_type g_unix_socket_address_get_path g_unix_socket_address_get_path_len #endif -#endif -#endif - -#if IN_HEADER(__G_SOCKET_ADDRESS_H__) -#if IN_FILE(__G_SOCKET_ADDRESS_C__) g_socket_address_new_from_native -g_socket_address_get_type G_GNUC_CONST +g_socket_address_get_type g_socket_address_get_family g_socket_address_get_native_size g_socket_address_to_native -#endif -#endif - -#if IN_HEADER(__G_PROXY_H__) -#if IN_FILE(__G_PROXY_C__) g_proxy_get_type g_proxy_get_default_for_protocol g_proxy_connect g_proxy_connect_async g_proxy_connect_finish g_proxy_supports_hostname -#endif -#endif - -#if IN_HEADER(__G_PROXY_RESOLVER_H__) -#if IN_FILE(__G_PROXY_RESOLVER_C__) g_proxy_resolver_get_default g_proxy_resolver_get_type g_proxy_resolver_is_supported g_proxy_resolver_lookup g_proxy_resolver_lookup_async g_proxy_resolver_lookup_finish -#endif -#endif - -#if IN_HEADER(__G_PROXY_ADDRESS_H__) -#if IN_FILE(__G_PROXY_ADDRESS_C__) g_proxy_address_get_type g_proxy_address_new g_proxy_address_get_protocol @@ -1199,21 +847,11 @@ g_proxy_address_get_destination_hostname g_proxy_address_get_destination_port g_proxy_address_get_username g_proxy_address_get_password -#endif -#endif - -#if IN_HEADER(__G_PROXY_ADDRESS_ENUMERATOR_H__) -#if IN_FILE(__G_PROXY_ADDRESS_ENUMERATOR_C__) g_proxy_address_enumerator_get_type -#endif -#endif - -#if IN_HEADER(__G_RESOLVER_H__) -#if IN_FILE(__G_RESOLVER_C__) g_resolver_error_quark g_resolver_free_addresses g_resolver_free_targets -g_resolver_get_type G_GNUC_CONST +g_resolver_get_type g_resolver_get_default g_resolver_set_default g_resolver_lookup_by_name @@ -1225,34 +863,14 @@ g_resolver_lookup_by_address_finish g_resolver_lookup_service g_resolver_lookup_service_async g_resolver_lookup_service_finish -#endif -#endif - -#if IN_HEADER(__G_THREADED_RESOLVER_H__) -#if IN_FILE(__G_THREADED_RESOLVER_C__) -g_threaded_resolver_get_type G_GNUC_CONST -#endif -#endif - -#if IN_HEADER(__G_UNIX_RESOLVER_H__) -#if IN_FILE(__G_UNIX_RESOLVER_C__) +g_threaded_resolver_get_type #ifdef G_OS_UNIX -g_unix_resolver_get_type G_GNUC_CONST +g_unix_resolver_get_type #endif -#endif -#endif - -#if IN_HEADER(__G_WIN32_RESOLVER_H__) -#if IN_FILE(__G_WIN32_RESOLVER_C__) #ifdef G_OS_WIN32 -g_win32_resolver_get_type G_GNUC_CONST +g_win32_resolver_get_type #endif -#endif -#endif - -#if IN_HEADER(__G_SRV_TARGET_H__) -#if IN_FILE(__G_SRV_TARGET_C__) -g_srv_target_get_type G_GNUC_CONST +g_srv_target_get_type g_srv_target_new g_srv_target_copy g_srv_target_free @@ -1261,75 +879,40 @@ g_srv_target_get_port g_srv_target_get_priority g_srv_target_get_weight g_srv_target_list_sort -#endif -#endif - -#if IN_HEADER(__G_NETWORK_ADDRESS_H__) -#if IN_FILE(__G_NETWORK_ADDRESS_C__) -g_network_address_get_type G_GNUC_CONST +g_network_address_get_type g_network_address_get_hostname g_network_address_get_port g_network_address_get_scheme g_network_address_new g_network_address_parse g_network_address_parse_uri -#endif -#endif - -#if IN_HEADER(__G_NETWORK_SERVICE_H__) -#if IN_FILE(__G_NETWORK_SERVICE_C__) -g_network_service_get_type G_GNUC_CONST +g_network_service_get_type g_network_service_get_service g_network_service_get_protocol g_network_service_get_domain g_network_service_get_scheme g_network_service_set_scheme g_network_service_new -#endif -#endif - -#if IN_HEADER(__G_SOCKET_CONNECTABLE_H__) -#if IN_FILE(__G_SOCKET_CONNECTABLE_C__) -g_socket_connectable_get_type G_GNUC_CONST +g_socket_connectable_get_type g_socket_connectable_enumerate g_socket_connectable_proxy_enumerate -#endif -#endif - -#if IN_HEADER(__G_SOCKET_ADDRESS_ENUMERATOR_H__) -#if IN_FILE(__G_SOCKET_ADDRESS_ENUMERATOR_C__) -g_socket_address_enumerator_get_type G_GNUC_CONST +g_socket_address_enumerator_get_type g_socket_address_enumerator_next g_socket_address_enumerator_next_async g_socket_address_enumerator_next_finish -#endif -#endif - -#if IN_HEADER(__G_ASYNC_INITABLE_H__) -#if IN_FILE(__G_ASYNC_INITABLE_C__) -g_async_initable_get_type G_GNUC_CONST +g_async_initable_get_type g_async_initable_init_async g_async_initable_init_finish g_async_initable_new_async g_async_initable_new_finish g_async_initable_new_valist_async g_async_initable_newv_async -#endif -#endif - -#if IN_HEADER(__G_INITABLE_H__) -#if IN_FILE(__G_INITABLE_C__) -g_initable_get_type G_GNUC_CONST +g_initable_get_type g_initable_init g_initable_new g_initable_newv g_initable_new_valist -#endif -#endif - -#if IN_HEADER(__G_SOCKET_H__) -#if IN_FILE(__G_SOCKET_C__) -g_socket_get_type G_GNUC_CONST +g_socket_get_type g_socket_accept g_socket_bind g_socket_check_connect_result @@ -1368,23 +951,13 @@ g_socket_set_keepalive g_socket_set_listen_backlog g_socket_speaks_ipv4 g_socket_get_credentials -#endif -#endif - -#if IN_HEADER(__G_SOCKET_CONTROL_MESSAGE_H__) -#if IN_FILE(__G_SOCKET_CONTROL_MESSAGE_C__) -g_socket_control_message_get_type G_GNUC_CONST +g_socket_control_message_get_type g_socket_control_message_deserialize g_socket_control_message_get_level g_socket_control_message_get_msg_type g_socket_control_message_get_size g_socket_control_message_serialize -#endif -#endif - -#if IN_HEADER(__G_SOCKET_CLIENT_H__) -#if IN_FILE(__G_SOCKET_CLIENT_C__) -g_socket_client_get_type G_GNUC_CONST +g_socket_client_get_type g_socket_client_add_application_proxy g_socket_client_connect g_socket_client_connect_async @@ -1415,24 +988,14 @@ g_socket_client_set_socket_type g_socket_client_set_timeout g_socket_client_set_tls g_socket_client_set_tls_validation_flags -#endif -#endif - -#if IN_HEADER(__G_SOCKET_CONNECTION_H__) -#if IN_FILE(__G_SOCKET_CONNECTION_C__) -g_socket_connection_get_type G_GNUC_CONST +g_socket_connection_get_type g_socket_connection_factory_create_connection g_socket_connection_factory_lookup_type g_socket_connection_factory_register_type g_socket_connection_get_local_address g_socket_connection_get_remote_address g_socket_connection_get_socket -#endif -#endif - -#if IN_HEADER(__G_SOCKET_LISTENER_H__) -#if IN_FILE(__G_SOCKET_LISTENER_C__) -g_socket_listener_get_type G_GNUC_CONST +g_socket_listener_get_type g_socket_listener_accept g_socket_listener_accept_async g_socket_listener_accept_finish @@ -1446,102 +1009,52 @@ g_socket_listener_add_socket g_socket_listener_close g_socket_listener_new g_socket_listener_set_backlog -#endif -#endif - -#if IN_HEADER(__G_SOCKET_SERVICE_H__) -#if IN_FILE(__G_SOCKET_SERVICE_C__) -g_socket_service_get_type G_GNUC_CONST +g_socket_service_get_type g_socket_service_is_active g_socket_service_new g_socket_service_start g_socket_service_stop -#endif -#endif - -#if IN_HEADER(__G_THREADED_SOCKET_SERVICE_H__) -#if IN_FILE(__G_THREADED_SOCKET_SERVICE_C__) -g_threaded_socket_service_get_type G_GNUC_CONST +g_threaded_socket_service_get_type g_threaded_socket_service_new -#endif -#endif - -#if IN_HEADER(__G_TCP_CONNECTION_H__) -#if IN_FILE(__G_TCP_CONNECTION_C__) -g_tcp_connection_get_type G_GNUC_CONST +g_tcp_connection_get_type g_tcp_connection_set_graceful_disconnect g_tcp_connection_get_graceful_disconnect -#endif -#endif - -#if IN_HEADER(__G_UNIX_CONNECTION_H__) -#if IN_FILE(__G_UNIX_CONNECTION_C__) #ifndef G_OS_WIN32 -g_unix_connection_get_type G_GNUC_CONST +g_unix_connection_get_type g_unix_connection_receive_fd g_unix_connection_send_fd g_unix_connection_receive_credentials g_unix_connection_send_credentials #endif -#endif -#endif - -#if IN_HEADER(__G_UNIX_FD_MESSAGE_H__) -#if IN_FILE(__G_UNIX_FD_MESSAGE_C__) #ifndef G_OS_WIN32 -g_unix_fd_message_get_type G_GNUC_CONST +g_unix_fd_message_get_type g_unix_fd_message_append_fd g_unix_fd_message_new g_unix_fd_message_steal_fds g_unix_fd_message_get_fd_list g_unix_fd_message_new_with_fd_list #endif -#endif -#endif - -#if IN_HEADER(__G_UNIX_FD_LIST_H__) -#if IN_FILE(__G_UNIX_FD_LIST_C__) #ifndef G_OS_WIN32 g_unix_fd_list_append g_unix_fd_list_get g_unix_fd_list_get_length -g_unix_fd_list_get_type G_GNUC_CONST +g_unix_fd_list_get_type g_unix_fd_list_new g_unix_fd_list_new_from_array g_unix_fd_list_peek_fds g_unix_fd_list_steal_fds #endif -#endif -#endif - -#if IN_HEADER(__G_ZLIB_COMPRESSOR_H__) -#if IN_FILE(__G_ZLIB_COMPRESSOR_C__) -g_zlib_compressor_get_type G_GNUC_CONST +g_zlib_compressor_get_type g_zlib_compressor_new g_zlib_compressor_get_file_info g_zlib_compressor_set_file_info -#endif -#endif - -#if IN_HEADER(__G_ZLIB_DECOMPRESSOR_H__) -#if IN_FILE(__G_ZLIB_DECOMPRESSOR_C__) -g_zlib_decompressor_get_type G_GNUC_CONST +g_zlib_decompressor_get_type g_zlib_decompressor_new g_zlib_decompressor_get_file_info -#endif -#endif - -#if IN_HEADER(__G_FILE_DESCRIPTOR_BASED_H__) -#if IN_FILE(__G_FILE_DESCRIPTOR_BASED_C__) #ifdef G_OS_UNIX -g_file_descriptor_based_get_type G_GNUC_CONST +g_file_descriptor_based_get_type g_file_descriptor_based_get_fd #endif -#endif -#endif - -#if IN_HEADER(__G_SETTINGS_BACKEND_H__) -#if IN_FILE(__G_SETTINGS_BACKEND_C__) g_settings_backend_get_type g_settings_backend_changed g_settings_backend_flatten_tree @@ -1551,28 +1064,11 @@ g_settings_backend_path_writable_changed g_settings_backend_writable_changed g_settings_backend_changed_tree g_settings_backend_get_default -#endif - -#if IN_FILE(__G_KEYFILE_SETTINGS_BACKEND_C__) g_keyfile_settings_backend_new -#endif - -#if IN_FILE(__G_MEMORY_SETTINGS_BACKEND_C__) g_memory_settings_backend_new -#endif - -#if IN_FILE(__G_NULL_SETTINGS_BACKEND_C__) g_null_settings_backend_new -#endif -#endif - -#if IN_HEADER(__G_SETTINGS_H__) -#if IN_FILE(__G_SETTINGS_SCHEMA_C__) g_settings_list_schemas g_settings_list_relocatable_schemas -#endif - -#if IN_FILE(__G_SETTINGS_C__) g_settings_apply g_settings_bind g_settings_bind_writable @@ -1615,12 +1111,7 @@ g_settings_list_children g_settings_get_mapped g_settings_get_range g_settings_range_check -#endif -#endif - -#if IN_HEADER(__G_CREDENTIALS_H__) -#if IN_FILE(__G_CREDENTIALS_C__) -g_credentials_get_type G_GNUC_CONST +g_credentials_get_type g_credentials_new g_credentials_to_string g_credentials_get_native @@ -1630,31 +1121,16 @@ g_credentials_is_same_user g_credentials_get_unix_user g_credentials_set_unix_user #endif -#endif -#endif - -#if IN_HEADER(__G_DBUS_ADDRESS_H__) -#if IN_FILE(__G_DBUS_ADDRESS_C__) g_dbus_is_address g_dbus_is_supported_address g_dbus_address_get_for_bus_sync g_dbus_address_get_stream g_dbus_address_get_stream_finish g_dbus_address_get_stream_sync -#endif -#endif - -#if IN_HEADER(__G_DBUS_AUTH_OBSERVER_H__) -#if IN_FILE(__G_DBUS_AUTH_OBSERVER_C__) -g_dbus_auth_observer_get_type G_GNUC_CONST +g_dbus_auth_observer_get_type g_dbus_auth_observer_new g_dbus_auth_observer_authorize_authenticated_peer -#endif -#endif - -#if IN_HEADER(__G_DBUS_CONNECTION_H__) -#if IN_FILE(__G_DBUS_CONNECTION_C__) -g_dbus_connection_get_type G_GNUC_CONST +g_dbus_connection_get_type g_bus_get g_bus_get_finish g_bus_get_sync @@ -1695,11 +1171,6 @@ g_dbus_connection_register_object g_dbus_connection_unregister_object g_dbus_connection_register_subtree g_dbus_connection_unregister_subtree -#endif -#endif - -#if IN_HEADER(__G_DBUS_ERROR_H__) -#if IN_FILE(__G_DBUS_ERROR_C__) g_dbus_error_quark g_dbus_error_new_for_dbus_error g_dbus_error_is_remote_error @@ -1711,18 +1182,13 @@ g_dbus_error_register_error_domain g_dbus_error_set_dbus_error g_dbus_error_set_dbus_error_valist g_dbus_error_unregister_error -#endif -#endif - -#if IN_HEADER(__G_DBUS_INTROSPECTION_H__) -#if IN_FILE(__G_DBUS_INTROSPECTION_C__) -g_dbus_annotation_info_get_type G_GNUC_CONST -g_dbus_arg_info_get_type G_GNUC_CONST -g_dbus_property_info_get_type G_GNUC_CONST -g_dbus_interface_info_get_type G_GNUC_CONST -g_dbus_method_info_get_type G_GNUC_CONST -g_dbus_signal_info_get_type G_GNUC_CONST -g_dbus_node_info_get_type G_GNUC_CONST +g_dbus_annotation_info_get_type +g_dbus_arg_info_get_type +g_dbus_property_info_get_type +g_dbus_interface_info_get_type +g_dbus_method_info_get_type +g_dbus_signal_info_get_type +g_dbus_node_info_get_type g_dbus_annotation_info_lookup g_dbus_annotation_info_ref g_dbus_annotation_info_unref @@ -1747,12 +1213,7 @@ g_dbus_interface_info_ref g_dbus_interface_info_unref g_dbus_node_info_ref g_dbus_node_info_unref -#endif -#endif - -#if IN_HEADER(__G_DBUS_MESSAGE_H__) -#if IN_FILE(__G_DBUS_MESSAGE_C__) -g_dbus_message_get_type G_GNUC_CONST +g_dbus_message_get_type g_dbus_message_new g_dbus_message_new_from_blob g_dbus_message_new_method_call @@ -1804,12 +1265,7 @@ g_dbus_message_to_gerror g_dbus_message_get_unix_fd_list g_dbus_message_set_unix_fd_list #endif -#endif -#endif - -#if IN_HEADER(__G_DBUS_METHOD_INVOCATION_H__) -#if IN_FILE(__G_DBUS_METHOD_INVOCATION_C__) -g_dbus_method_invocation_get_type G_GNUC_CONST +g_dbus_method_invocation_get_type g_dbus_method_invocation_get_connection g_dbus_method_invocation_get_interface_name g_dbus_method_invocation_get_message @@ -1826,32 +1282,17 @@ g_dbus_method_invocation_return_error_valist g_dbus_method_invocation_return_gerror g_dbus_method_invocation_take_error g_dbus_method_invocation_return_value -#endif -#endif - -#if IN_HEADER(__G_DBUS_NAME_OWNING_H__) -#if IN_FILE(__G_DBUS_NAME_OWNING_C__) g_bus_own_name g_bus_own_name_on_connection g_bus_unown_name g_bus_own_name_with_closures g_bus_own_name_on_connection_with_closures -#endif -#endif - -#if IN_HEADER(__G_DBUS_NAME_WATCHING_H__) -#if IN_FILE(__G_DBUS_NAME_WATCHING_C__) g_bus_watch_name g_bus_watch_name_on_connection g_bus_unwatch_name g_bus_watch_name_with_closures g_bus_watch_name_on_connection_with_closures -#endif -#endif - -#if IN_HEADER(__G_DBUS_PROXY_H__) -#if IN_FILE(__G_DBUS_PROXY_C__) -g_dbus_proxy_get_type G_GNUC_CONST +g_dbus_proxy_get_type g_dbus_proxy_new g_dbus_proxy_new_finish g_dbus_proxy_new_sync @@ -1874,12 +1315,7 @@ g_dbus_proxy_set_interface_info g_dbus_proxy_call g_dbus_proxy_call_finish g_dbus_proxy_call_sync -#endif -#endif - -#if IN_HEADER(__G_DBUS_SERVER_H__) -#if IN_FILE(__G_DBUS_SERVER_C__) -g_dbus_server_get_type G_GNUC_CONST +g_dbus_server_get_type g_dbus_server_new_sync g_dbus_server_is_active g_dbus_server_start @@ -1887,11 +1323,6 @@ g_dbus_server_stop g_dbus_server_get_client_address g_dbus_server_get_flags g_dbus_server_get_guid -#endif -#endif - -#if IN_HEADER(__G_DBUS_UTILS_H__) -#if IN_FILE(__G_DBUS_UTILS_C__) g_dbus_generate_guid g_dbus_is_guid g_dbus_is_interface_name @@ -1900,23 +1331,13 @@ g_dbus_is_name g_dbus_is_unique_name g_dbus_gvalue_to_gvariant g_dbus_gvariant_to_gvalue -#endif -#endif - -#if IN_HEADER(__G_UNIX_CREDENTIALS_MESSAGE_H__) -#if IN_FILE(__G_UNIX_CREDENTIALS_MESSAGE_C__) #ifdef G_OS_UNIX -g_unix_credentials_message_get_type G_GNUC_CONST +g_unix_credentials_message_get_type g_unix_credentials_message_new g_unix_credentials_message_new_with_credentials g_unix_credentials_message_get_credentials g_unix_credentials_message_is_supported #endif -#endif -#endif - -#if IN_HEADER(__G_PERMISSION_H__) -#if IN_FILE(__G_PERMISSION_C__) g_permission_acquire g_permission_acquire_async g_permission_acquire_finish @@ -1928,18 +1349,8 @@ g_permission_impl_update g_permission_release g_permission_release_async g_permission_release_finish -#endif -#endif - -#if IN_HEADER(__G_SIMPLE_PERMISSION_H__) -#if IN_FILE(__G_SIMPLE_PERMISSION_C__) g_simple_permission_get_type g_simple_permission_new -#endif -#endif - -#if IN_HEADER(__G_ACTION_GROUP_H__) -#if IN_FILE(__G_ACTION_GROUP_C__) g_action_group_action_added g_action_group_action_enabled_changed g_action_group_action_removed @@ -1954,11 +1365,6 @@ g_action_group_get_type g_action_group_has_action g_action_group_list_actions g_action_group_change_action_state -#endif -#endif - -#if IN_HEADER(__G_ACTION_H__) -#if IN_FILE(__G_ACTION_C__) g_action_activate g_action_get_enabled g_action_get_name @@ -1968,85 +1374,45 @@ g_action_get_state_hint g_action_get_state_type g_action_get_type g_action_set_state -#endif -#endif - -#if IN_HEADER(__G_SIMPLE_ACTION_GROUP_H__) -#if IN_FILE(__G_SIMPLE_ACTION_GROUP_C__) -g_simple_action_group_get_type G_GNUC_CONST +g_simple_action_group_get_type g_simple_action_group_insert g_simple_action_group_lookup g_simple_action_group_new g_simple_action_group_remove -#endif -#endif - -#if IN_HEADER(__G_SIMPLE_ACTION_H__) -#if IN_FILE(__G_SIMPLE_ACTION_C__) g_simple_action_get_parameter_type g_simple_action_get_type g_simple_action_new g_simple_action_new_stateful g_simple_action_set_enabled -#endif -#endif - -#if IN_HEADER(__G_POLLABLE_INPUT_STREAM_H__) -#if IN_FILE(__G_POLLABLE_INPUT_STREAM_C__) -g_pollable_input_stream_get_type G_GNUC_CONST +g_pollable_input_stream_get_type g_pollable_input_stream_can_poll g_pollable_input_stream_create_source g_pollable_input_stream_is_readable g_pollable_input_stream_read_nonblocking g_pollable_source_new -#endif -#endif - -#if IN_HEADER(__G_POLLABLE_OUTPUT_STREAM_H__) -#if IN_FILE(__G_POLLABLE_OUTPUT_STREAM_C__) -g_pollable_output_stream_get_type G_GNUC_CONST +g_pollable_output_stream_get_type g_pollable_output_stream_can_poll g_pollable_output_stream_create_source g_pollable_output_stream_is_writable g_pollable_output_stream_write_nonblocking -#endif -#endif - -#if IN_HEADER(__G_TCP_WRAPPER_CONNECTION_H__) -#if IN_FILE(__G_TCP_WRAPPER_CONNECTION_C__) -g_tcp_wrapper_connection_get_type G_GNUC_CONST +g_tcp_wrapper_connection_get_type g_tcp_wrapper_connection_get_base_io_stream g_tcp_wrapper_connection_new -#endif -#endif - -#if IN_HEADER(__G_TLS_BACKEND_H__) -#if IN_FILE(__G_TLS_BACKEND_C__) g_tls_backend_get_certificate_type g_tls_backend_get_client_connection_type g_tls_backend_get_default g_tls_backend_get_server_connection_type -g_tls_backend_get_type G_GNUC_CONST +g_tls_backend_get_type g_tls_backend_supports_tls -g_tls_error_get_type G_GNUC_CONST +g_tls_error_get_type g_tls_error_quark -#endif -#endif - -#if IN_HEADER(__G_TLS_CERTIFICATE_H__) -#if IN_FILE(__G_TLS_CERTIFICATE_C__) g_tls_certificate_get_issuer -g_tls_certificate_get_type G_GNUC_CONST +g_tls_certificate_get_type g_tls_certificate_list_new_from_file g_tls_certificate_new_from_file g_tls_certificate_new_from_files g_tls_certificate_new_from_pem g_tls_certificate_verify -#endif -#endif - -#if IN_HEADER(__G_TLS_CONNECTION_H__) -#if IN_FILE(__G_TLS_CONNECTION_C__) g_tls_connection_emit_accept_certificate g_tls_connection_get_certificate g_tls_connection_get_peer_certificate @@ -2054,7 +1420,7 @@ g_tls_connection_get_peer_certificate_errors g_tls_connection_get_rehandshake_mode g_tls_connection_get_require_close_notify g_tls_connection_get_use_system_certdb -g_tls_connection_get_type G_GNUC_CONST +g_tls_connection_get_type g_tls_connection_handshake g_tls_connection_handshake_async g_tls_connection_handshake_finish @@ -2062,48 +1428,23 @@ g_tls_connection_set_certificate g_tls_connection_set_rehandshake_mode g_tls_connection_set_require_close_notify g_tls_connection_set_use_system_certdb -#endif -#endif - -#if IN_HEADER(__G_TLS_CLIENT_CONNECTION_H__) -#if IN_FILE(__G_TLS_CLIENT_CONNECTION_C__) g_tls_client_connection_get_accepted_cas g_tls_client_connection_get_server_identity -g_tls_client_connection_get_type G_GNUC_CONST +g_tls_client_connection_get_type g_tls_client_connection_get_use_ssl3 g_tls_client_connection_get_validation_flags g_tls_client_connection_new g_tls_client_connection_set_server_identity g_tls_client_connection_set_use_ssl3 g_tls_client_connection_set_validation_flags -#endif -#endif - -#if IN_HEADER(__G_TLS_SERVER_CONNECTION_H__) -#if IN_FILE(__G_TLS_SERVER_CONNECTION_C__) -g_tls_server_connection_get_type G_GNUC_CONST +g_tls_server_connection_get_type g_tls_server_connection_new -#endif -#endif - -#if IN_HEADER(__G_TIME_ZONE_MONITOR_H__) -#if IN_FILE(__G_TIME_ZONE_MONITOR_C__) -g_time_zone_monitor_get_type G_GNUC_CONST +g_time_zone_monitor_get_type g_time_zone_monitor_get -#endif -#endif - -#if IN_HEADER(__G_DBUS_INTERFACE_H__) -#if IN_FILE(__G_DBUS_INTERFACE_C__) g_dbus_interface_get_info g_dbus_interface_get_object g_dbus_interface_get_type g_dbus_interface_set_object -#endif -#endif - -#if IN_HEADER(__G_DBUS_INTERFACE_SKELETON_H__) -#if IN_FILE(__G_DBUS_INTERFACE_SKELETON_C__) g_dbus_interface_skeleton_export g_dbus_interface_skeleton_flags_get_type g_dbus_interface_skeleton_flush @@ -2116,28 +1457,13 @@ g_dbus_interface_skeleton_get_type g_dbus_interface_skeleton_get_vtable g_dbus_interface_skeleton_set_flags g_dbus_interface_skeleton_unexport -#endif -#endif - -#if IN_HEADER(__G_DBUS_OBJECT_H__) -#if IN_FILE(__G_DBUS_OBJECT_C__) g_dbus_object_get_interface g_dbus_object_get_interfaces g_dbus_object_get_object_path g_dbus_object_get_type -#endif -#endif - -#if IN_HEADER(__G_DBUS_OBJECT_PROXY_H__) -#if IN_FILE(__G_DBUS_OBJECT_PROXY_C__) g_dbus_object_proxy_new g_dbus_object_proxy_get_connection g_dbus_object_proxy_get_type -#endif -#endif - -#if IN_HEADER(__G_DBUS_OBJECT_SKELETON_H__) -#if IN_FILE(__G_DBUS_OBJECT_SKELETON_C__) g_dbus_object_skeleton_add_interface g_dbus_object_skeleton_flush g_dbus_object_skeleton_get_type @@ -2145,21 +1471,11 @@ g_dbus_object_skeleton_new g_dbus_object_skeleton_remove_interface g_dbus_object_skeleton_remove_interface_by_name g_dbus_object_skeleton_set_object_path -#endif -#endif - -#if IN_HEADER(__G_DBUS_OBJECT_MANAGER_H__) -#if IN_FILE(__G_DBUS_OBJECT_MANAGER_C__) g_dbus_object_manager_get_interface g_dbus_object_manager_get_object g_dbus_object_manager_get_object_path g_dbus_object_manager_get_objects g_dbus_object_manager_get_type -#endif -#endif - -#if IN_HEADER(__G_DBUS_OBJECT_MANAGER_CLIENT_H__) -#if IN_FILE(__G_DBUS_OBJECT_MANAGER_CLIENT_C__) g_dbus_object_manager_client_flags_get_type g_dbus_object_manager_client_get_connection g_dbus_object_manager_client_get_flags @@ -2172,11 +1488,6 @@ g_dbus_object_manager_client_new_for_bus g_dbus_object_manager_client_new_for_bus_finish g_dbus_object_manager_client_new_for_bus_sync g_dbus_object_manager_client_new_sync -#endif -#endif - -#if IN_HEADER(__G_DBUS_OBJECT_MANAGER_SERVER_H__) -#if IN_FILE(__G_DBUS_OBJECT_MANAGER_SERVER_C__) g_dbus_object_manager_server_export g_dbus_object_manager_server_export_uniquely g_dbus_object_manager_server_get_connection @@ -2184,5 +1495,3 @@ g_dbus_object_manager_server_set_connection g_dbus_object_manager_server_get_type g_dbus_object_manager_server_new g_dbus_object_manager_server_unexport -#endif -#endif diff --git a/glib/Makefile.am b/glib/Makefile.am index af8609fc7..5a6bef789 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -62,7 +62,7 @@ AM_CPPFLAGS = \ -DPCRE_STATIC glib.def: glib.symbols - $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def + $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /') > glib.def if OS_LINUX if HAVE_GNUC_VISIBILITY diff --git a/glib/abicheck.sh b/glib/abicheck.sh index d2c9d88cc..313779404 100755 --- a/glib/abicheck.sh +++ b/glib/abicheck.sh @@ -5,7 +5,7 @@ egrep '^#([^i]|if).*[^\]$' "${builddir:-.}/glibconfig.h" > glibconfig.cpp INCLUDES="-include ${top_builddir:-..}/config.h" INCLUDES="$INCLUDES -include glibconfig.cpp $GLIB_DEBUG_FLAGS" -cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi +cpp -P -DG_STDIO_NO_WRAP_ON_UNIX $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ PRIVATE$//' | sort > expected-abi rm -f glibconfig.cpp nm -D -g --defined-only .libs/libglib-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi diff --git a/glib/glib.symbols b/glib/glib.symbols index 7c8297047..f3ae0a95f 100644 --- a/glib/glib.symbols +++ b/glib/glib.symbols @@ -1,16 +1,6 @@ /* This file lists all exported symbols. It is used to generate * the glib.def file used to control exports on Windows. - * - * Every symbol must be included in the right - * #ifdef IN_HEADER(sym) #endif and - * #ifdef IN_FILE(sym) #endif sections. */ -#ifdef ALL_FILES -#define IN_FILE(x) 1 -#define IN_HEADER(x) 1 -#endif -#if IN_HEADER(__G_ARRAY_H__) -#if IN_FILE(__G_ARRAY_C__) g_array_append_vals g_array_free g_array_insert_vals @@ -56,11 +46,6 @@ g_ptr_array_set_size g_ptr_array_sized_new g_ptr_array_sort g_ptr_array_sort_with_data -#endif -#endif - -#if IN_HEADER(__G_ASYNCQUEUE_H__) -#if IN_FILE(__G_ASYNCQUEUE_C__) g_async_queue_length g_async_queue_length_unlocked g_async_queue_lock @@ -81,49 +66,24 @@ g_async_queue_try_pop g_async_queue_try_pop_unlocked g_async_queue_unlock g_async_queue_unref -#ifndef G_DISABLE_DEPRECATED g_async_queue_ref_unlocked g_async_queue_unref_and_unlock -#endif -#endif -#endif - -#if IN_HEADER(__G_ATOMIC_H__) -#if IN_FILE(__G_ATOMIC_C__) g_atomic_int_add g_atomic_int_compare_and_exchange g_atomic_int_exchange_and_add g_atomic_pointer_compare_and_exchange -#ifdef INCLUDE_INTERNAL_SYMBOLS - /* these are not internal, but we don't want to alias them */ g_atomic_int_get g_atomic_pointer_get g_atomic_int_set g_atomic_pointer_set -#endif -#endif -#endif - -#if IN_HEADER(__G_BACKTRACE_H__) -#if IN_FILE(__G_BACKTRACE_C__) g_on_error_query g_on_error_stack_trace -#endif -#endif - -#if IN_HEADER(__G_BASE64_H__) -#if IN_FILE(__G_BASE64_C__) g_base64_encode_step g_base64_encode_close -g_base64_encode G_GNUC_MALLOC +g_base64_encode g_base64_decode_step -g_base64_decode G_GNUC_MALLOC +g_base64_decode g_base64_decode_inplace -#endif -#endif - -#if IN_HEADER(__G_BOOKMARK_FILE_H__) -#if IN_FILE(__G_BOOKMARK_FILE_C__) g_bookmark_file_error_quark g_bookmark_file_new g_bookmark_file_free @@ -133,18 +93,18 @@ g_bookmark_file_load_from_data_dirs g_bookmark_file_to_data g_bookmark_file_to_file g_bookmark_file_set_title -g_bookmark_file_get_title G_GNUC_MALLOC +g_bookmark_file_get_title g_bookmark_file_set_description -g_bookmark_file_get_description G_GNUC_MALLOC +g_bookmark_file_get_description g_bookmark_file_set_mime_type -g_bookmark_file_get_mime_type G_GNUC_MALLOC +g_bookmark_file_get_mime_type g_bookmark_file_set_groups g_bookmark_file_add_group g_bookmark_file_has_group -g_bookmark_file_get_groups G_GNUC_MALLOC +g_bookmark_file_get_groups g_bookmark_file_add_application g_bookmark_file_has_application -g_bookmark_file_get_applications G_GNUC_MALLOC +g_bookmark_file_get_applications g_bookmark_file_set_app_info g_bookmark_file_get_app_info g_bookmark_file_set_is_private @@ -159,29 +119,17 @@ g_bookmark_file_set_visited g_bookmark_file_get_visited g_bookmark_file_has_item g_bookmark_file_get_size -g_bookmark_file_get_uris G_GNUC_MALLOC +g_bookmark_file_get_uris g_bookmark_file_remove_group g_bookmark_file_remove_application g_bookmark_file_remove_item g_bookmark_file_move_item -#endif -#endif - -#if IN_HEADER(__G_CACHE_H__) -#if IN_FILE(__G_CACHE_C__) g_cache_destroy g_cache_insert g_cache_key_foreach g_cache_new g_cache_remove -#ifndef G_DISABLE_DEPRECATED g_cache_value_foreach -#endif -#endif -#endif - -#if IN_HEADER(__G_CHECKSUM_H__) -#if IN_FILE(__G_CHECKSUM_C__) g_checksum_type_get_length g_checksum_new g_checksum_copy @@ -192,11 +140,6 @@ g_checksum_get_string g_checksum_get_digest g_compute_checksum_for_data g_compute_checksum_for_string -#endif -#endif - -#if IN_HEADER(__G_COMPLETION_H__) -#if IN_FILE(__G_COMPLETION_C__) g_completion_add_items g_completion_clear_items g_completion_complete @@ -205,41 +148,31 @@ g_completion_free g_completion_new g_completion_remove_items g_completion_set_compare -#endif -#endif - -#if IN_HEADER(__G_CONVERT_H__) -#if IN_FILE(__G_CONVERT_C__) g_get_filename_charsets -g_convert G_GNUC_MALLOC +g_convert g_convert_error_quark -g_convert_with_fallback G_GNUC_MALLOC -g_convert_with_iconv G_GNUC_MALLOC +g_convert_with_fallback +g_convert_with_iconv g_iconv g_iconv_close g_iconv_open -g_locale_from_utf8 G_GNUC_MALLOC -g_locale_to_utf8 G_GNUC_MALLOC -g_filename_display_name G_GNUC_MALLOC -g_filename_display_basename G_GNUC_MALLOC +g_locale_from_utf8 +g_locale_to_utf8 +g_filename_display_name +g_filename_display_basename #ifndef _WIN64 -g_filename_from_uri PRIVATE G_GNUC_MALLOC -g_filename_from_utf8 PRIVATE G_GNUC_MALLOC -g_filename_to_uri PRIVATE G_GNUC_MALLOC -g_filename_to_utf8 PRIVATE G_GNUC_MALLOC +g_filename_from_uri PRIVATE +g_filename_from_utf8 PRIVATE +g_filename_to_uri PRIVATE +g_filename_to_utf8 PRIVATE #endif #ifdef G_OS_WIN32 -g_filename_from_uri_utf8 G_GNUC_MALLOC +g_filename_from_uri_utf8 g_filename_from_utf8_utf8 -g_filename_to_uri_utf8 G_GNUC_MALLOC +g_filename_to_uri_utf8 g_filename_to_utf8_utf8 #endif -g_uri_list_extract_uris G_GNUC_MALLOC -#endif -#endif - -#if IN_HEADER(__G_DATASET_H__) -#if IN_FILE(__G_DATASET_C__) +g_uri_list_extract_uris g_datalist_clear g_datalist_foreach g_datalist_get_flags @@ -254,22 +187,12 @@ g_dataset_foreach g_dataset_id_get_data g_dataset_id_remove_no_notify g_dataset_id_set_data_full -#endif -#endif - -#if IN_HEADER(__G_QUARK_H__) -#if IN_FILE(__G_DATASET_C__) g_quark_from_static_string g_quark_from_string -g_quark_to_string G_GNUC_CONST +g_quark_to_string g_quark_try_string g_intern_string g_intern_static_string -#endif -#endif - -#if IN_HEADER(__G_DATE_H__) -#if IN_FILE(__G_DATE_C__) g_date_add_days g_date_add_months g_date_add_years @@ -284,15 +207,15 @@ g_date_get_days_in_month g_date_get_iso8601_week_of_year g_date_get_julian g_date_get_monday_week_of_year -g_date_get_monday_weeks_in_year G_GNUC_CONST +g_date_get_monday_weeks_in_year g_date_get_month g_date_get_sunday_week_of_year -g_date_get_sunday_weeks_in_year G_GNUC_CONST +g_date_get_sunday_weeks_in_year g_date_get_weekday g_date_get_year g_date_is_first_of_month g_date_is_last_of_month -g_date_is_leap_year G_GNUC_CONST +g_date_is_leap_year g_date_new g_date_new_dmy g_date_new_julian @@ -302,9 +225,7 @@ g_date_set_dmy g_date_set_julian g_date_set_month g_date_set_parse -#ifndef G_DISABLE_DEPRECATED g_date_set_time -#endif g_date_set_time_t g_date_set_time_val g_date_set_year @@ -314,17 +235,12 @@ g_date_subtract_months g_date_subtract_years g_date_to_struct_tm g_date_valid -g_date_valid_day G_GNUC_CONST +g_date_valid_day g_date_valid_dmy -g_date_valid_julian G_GNUC_CONST -g_date_valid_month G_GNUC_CONST -g_date_valid_weekday G_GNUC_CONST -g_date_valid_year G_GNUC_CONST -#endif -#endif - -#if IN_HEADER(__G_DATE_TIME_H__) -#if IN_FILE(__G_DATE_TIME_C__) +g_date_valid_julian +g_date_valid_month +g_date_valid_weekday +g_date_valid_year g_date_time_add g_date_time_add_days g_date_time_add_full @@ -337,7 +253,7 @@ g_date_time_add_years g_date_time_compare g_date_time_difference g_date_time_equal -g_date_time_format G_GNUC_MALLOC +g_date_time_format g_date_time_get_day_of_month g_date_time_get_day_of_week g_date_time_get_day_of_year @@ -372,11 +288,6 @@ g_date_time_to_timezone g_date_time_to_unix g_date_time_to_utc g_date_time_unref -#endif -#endif - -#if IN_HEADER(__G_TIME_ZONE_H__) -#if IN_FILE(__G_TIME_ZONE_C__) g_time_zone_new g_time_zone_refresh_local g_time_zone_new_local @@ -388,11 +299,6 @@ g_time_zone_find_interval g_time_zone_get_abbreviation g_time_zone_get_offset g_time_zone_is_dst -#endif -#endif - -#if IN_HEADER(__G_DIR_H__) -#if IN_FILE(__G_DIR_C__) g_dir_close #ifndef _WIN64 g_dir_open PRIVATE @@ -403,32 +309,22 @@ g_dir_open_utf8 g_dir_read_name_utf8 #endif g_dir_rewind -#endif -#endif - -#if IN_HEADER(__G_ERROR_H__) -#if IN_FILE(__G_ERROR_C__) g_clear_error g_error_copy g_error_free g_error_matches -g_error_new G_GNUC_PRINTF(3,4) +g_error_new g_error_new_literal g_error_new_valist g_propagate_error -g_set_error G_GNUC_PRINTF(4,5) +g_set_error g_set_error_literal -g_prefix_error G_GNUC_PRINTF(2,3) -g_propagate_prefixed_error G_GNUC_PRINTF(3,4) -#endif -#endif - -#if IN_HEADER(__G_FILEUTILS_H__) -#if IN_FILE(__G_FILEUTILS_C__) -g_build_filename G_GNUC_MALLOC G_GNUC_NULL_TERMINATED -g_build_filenamev G_GNUC_MALLOC -g_build_path G_GNUC_MALLOC G_GNUC_NULL_TERMINATED -g_build_pathv G_GNUC_MALLOC +g_prefix_error +g_propagate_prefixed_error +g_build_filename +g_build_filenamev +g_build_path +g_build_pathv g_file_error_from_errno g_file_error_quark #ifndef _WIN64 @@ -452,11 +348,6 @@ g_file_open_tmp_utf8 g_file_test_utf8 g_mkstemp_utf8 #endif -#endif -#endif - -#if IN_HEADER(__G_HASH_H__) -#if IN_FILE(__G_HASH_C__) g_hash_table_destroy g_hash_table_unref g_hash_table_ref @@ -482,11 +373,6 @@ g_hash_table_iter_next g_hash_table_iter_get_hash_table g_hash_table_iter_remove g_hash_table_iter_steal -#endif -#endif - -#if IN_HEADER(__G_HOOK_H__) -#if IN_FILE(__G_HOOK_C__) g_hook_alloc g_hook_compare_ids g_hook_destroy @@ -510,11 +396,6 @@ g_hook_next_valid g_hook_prepend g_hook_ref g_hook_unref -#endif -#endif - -#if IN_HEADER(__G_IOCHANNEL_H__) -#if IN_FILE(__G_IOCHANNEL_C__) g_io_add_watch g_io_add_watch_full g_io_create_watch @@ -544,29 +425,17 @@ g_io_channel_set_flags g_io_channel_set_line_term g_io_channel_shutdown g_io_channel_unref -#ifndef G_DISABLE_DEPRECATED g_io_channel_close g_io_channel_read g_io_channel_seek g_io_channel_write -#endif g_io_channel_write_chars g_io_channel_write_unichar -#endif -#endif - -#if IN_HEADER(__G_IOCHANNEL_H__) -#if IN_FILE(__G_IO_UNIX_C__) #ifdef G_OS_UNIX g_io_channel_unix_get_fd g_io_channel_unix_new -g_io_channel_new_file PRIVATE +g_io_channel_new_file #endif -#endif -#endif - -#if IN_HEADER(__G_IOCHANNEL_H__) -#if IN_FILE(__G_IO_WIN32_C__) #ifdef G_OS_WIN32 g_io_channel_unix_get_fd g_io_channel_unix_new @@ -585,30 +454,25 @@ g_io_channel_win32_new_stream_socket PRIVATE g_io_channel_win32_poll g_io_channel_win32_set_debug #endif -#endif -#endif - -#if IN_HEADER(__G_KEY_FILE_H__) -#if IN_FILE(__G_KEY_FILE_C__) g_key_file_error_quark g_key_file_free g_key_file_get_boolean -g_key_file_get_boolean_list G_GNUC_MALLOC -g_key_file_get_comment G_GNUC_MALLOC -g_key_file_get_groups G_GNUC_MALLOC +g_key_file_get_boolean_list +g_key_file_get_comment +g_key_file_get_groups g_key_file_get_double -g_key_file_get_double_list G_GNUC_MALLOC +g_key_file_get_double_list g_key_file_get_integer g_key_file_get_int64 g_key_file_get_uint64 -g_key_file_get_integer_list G_GNUC_MALLOC -g_key_file_get_keys G_GNUC_MALLOC -g_key_file_get_locale_string G_GNUC_MALLOC -g_key_file_get_locale_string_list G_GNUC_MALLOC -g_key_file_get_start_group G_GNUC_MALLOC -g_key_file_get_string G_GNUC_MALLOC -g_key_file_get_string_list G_GNUC_MALLOC -g_key_file_get_value G_GNUC_MALLOC +g_key_file_get_integer_list +g_key_file_get_keys +g_key_file_get_locale_string +g_key_file_get_locale_string_list +g_key_file_get_start_group +g_key_file_get_string +g_key_file_get_string_list +g_key_file_get_value g_key_file_has_group g_key_file_has_key g_key_file_has_key_full @@ -635,12 +499,7 @@ g_key_file_set_locale_string_list g_key_file_set_string g_key_file_set_string_list g_key_file_set_value -g_key_file_to_data G_GNUC_MALLOC -#endif -#endif - -#if IN_HEADER(__G_LIST_H__) -#if IN_FILE(__G_LIST_C__) +g_key_file_to_data g_list_alloc g_list_append g_list_concat @@ -663,25 +522,16 @@ g_list_length g_list_nth g_list_nth_data g_list_nth_prev -#ifndef G_DISABLE_DEPRECATED g_list_pop_allocator -#endif g_list_position g_list_prepend -#ifndef G_DISABLE_DEPRECATED g_list_push_allocator -#endif g_list_remove g_list_remove_all g_list_remove_link g_list_reverse g_list_sort g_list_sort_with_data -#endif -#endif - -#if IN_HEADER(__G_MAIN_H__) -#if IN_FILE(__G_MAIN_C__) g_child_watch_add g_child_watch_add_full g_child_watch_source_new @@ -731,9 +581,7 @@ g_source_destroy g_source_get_can_recurse g_source_get_context g_source_get_time -#ifndef G_DISABLE_DEPRECATED g_source_get_current_time -#endif g_source_get_id g_source_get_name g_source_get_priority @@ -763,24 +611,12 @@ g_timeout_add_full g_timeout_add_seconds_full g_timeout_source_new g_timeout_source_new_seconds -#endif -#endif - -#if IN_HEADER(__G_MAPPED_FILE_H__) -#if IN_FILE(__G_MAPPED_FILE_C__) -g_mapped_file_new G_GNUC_MALLOC +g_mapped_file_new g_mapped_file_get_length g_mapped_file_get_contents g_mapped_file_ref g_mapped_file_unref -#ifndef G_DISABLE_DEPRECATED g_mapped_file_free -#endif -#endif -#endif - -#if IN_HEADER(__G_MARKUP_H__) -#if IN_FILE(__G_MARKUP_C__) g_markup_error_quark g_markup_escape_text g_markup_parse_context_end_parse @@ -793,31 +629,25 @@ g_markup_parse_context_new g_markup_parse_context_parse g_markup_parse_context_push g_markup_parse_context_pop -g_markup_printf_escaped G_GNUC_PRINTF(1,2) +g_markup_printf_escaped g_markup_vprintf_escaped g_markup_collect_attributes -#endif -#endif - -#if IN_HEADER(__G_MEM_H__) -#if IN_FILE(__G_MEM_C__) g_free -g_malloc G_GNUC_MALLOC -g_malloc0 G_GNUC_MALLOC -g_malloc_n G_GNUC_MALLOC -g_malloc0_n G_GNUC_MALLOC +g_malloc +g_malloc0 +g_malloc_n +g_malloc0_n g_mem_is_system_malloc g_mem_profile g_mem_set_vtable g_realloc g_realloc_n -g_try_malloc G_GNUC_MALLOC -g_try_malloc0 G_GNUC_MALLOC -g_try_malloc_n G_GNUC_MALLOC -g_try_malloc0_n G_GNUC_MALLOC +g_try_malloc +g_try_malloc0 +g_try_malloc_n +g_try_malloc0_n g_try_realloc g_try_realloc_n -#ifndef G_DISABLE_DEPRECATED g_allocator_free g_allocator_new g_mem_chunk_alloc @@ -830,32 +660,19 @@ g_mem_chunk_new g_mem_chunk_print g_mem_chunk_reset g_blow_chunks -#endif -#endif -#endif - -#if IN_HEADER(__G_SLICE_H__) -#if IN_FILE(__G_SLICE_C__) -g_slice_alloc G_GNUC_MALLOC -g_slice_alloc0 G_GNUC_MALLOC -g_slice_copy G_GNUC_MALLOC +g_slice_alloc +g_slice_alloc0 +g_slice_copy g_slice_free1 g_slice_free_chain_with_offset g_slice_set_config g_slice_get_config g_slice_get_config_state #ifdef G_ENABLE_DEBUG -#ifdef INCLUDE_INTERNAL_SYMBOLS g_slice_debug_tree_statistics #endif -#endif -#endif -#endif - -#if IN_HEADER(__G_MESSAGES_H__) -#if IN_FILE(__G_MESSAGES_C__) g_printf_string_upper_bound -g_log G_GNUC_PRINTF(3,4) +g_log g_log_default_handler g_log_remove_handler g_log_set_always_fatal @@ -865,18 +682,11 @@ g_log_set_handler g_logv g_return_if_fail_warning g_warn_message -#ifndef G_DISABLE_DEPRECATED -g_assert_warning G_GNUC_NORETURN -#endif -g_print G_GNUC_PRINTF(1,2) -g_printerr G_GNUC_PRINTF(1,2) +g_assert_warning +g_print +g_printerr g_set_printerr_handler g_set_print_handler -#endif -#endif - -#if IN_HEADER(__G_NODE_H__) -#if IN_FILE(__G_NODE_C__) g_node_child_index g_node_child_position g_node_children_foreach @@ -899,21 +709,12 @@ g_node_n_children g_node_new g_node_n_nodes g_node_nth_child -#ifndef G_DISABLE_DEPRECATED g_node_pop_allocator -#endif g_node_prepend -#ifndef G_DISABLE_DEPRECATED g_node_push_allocator -#endif g_node_reverse_children g_node_traverse g_node_unlink -#endif -#endif - -#if IN_HEADER(__G_OPTION_H__) -#if IN_FILE(__G_OPTION_C__) g_option_context_add_group g_option_context_add_main_entries g_option_error_quark @@ -940,59 +741,24 @@ g_option_group_set_error_hook g_option_group_set_parse_hooks g_option_group_set_translate_func g_option_group_set_translation_domain -#endif -#endif - -#if IN_HEADER(__G_PATTERN_H__) -#if IN_FILE(__G_PATTERN_C__) g_pattern_match g_pattern_match_simple g_pattern_match_string g_pattern_spec_equal g_pattern_spec_free g_pattern_spec_new -#endif -#endif - -#if IN_HEADER(__G_POLL_H__) -#if IN_FILE(__G_POLL_C__) g_poll -#endif -#endif - -#if IN_HEADER(__G_PRIMES_H__) -#if IN_FILE(__G_PRIMES_C__) -g_spaced_primes_closest G_GNUC_CONST -#endif -#endif - -#if IN_HEADER(__G_PRINTF_H__) -#if IN_FILE(__G_PRINTF_C__) -g_fprintf G_GNUC_PRINTF(2,3) -g_printf G_GNUC_PRINTF(1,2) -g_sprintf G_GNUC_PRINTF(2,3) +g_spaced_primes_closest +g_fprintf +g_printf +g_sprintf g_vasprintf g_vfprintf g_vprintf g_vsprintf -#endif -#endif - -#if IN_HEADER(__G_UTILS_H__) -#if IN_FILE(__G_PRINTF_C__) -g_snprintf G_GNUC_PRINTF(3,4) +g_snprintf g_vsnprintf -#endif -#endif - -#if IN_HEADER(__G_QSORT_H__) -#if IN_FILE(__G_QSORT_C__) g_qsort_with_data -#endif -#endif - -#if IN_HEADER(__G_QUEUE_H__) -#if IN_FILE(__G_QUEUE_C__) g_queue_clear g_queue_copy g_queue_delete_link @@ -1032,11 +798,6 @@ g_queue_remove_all g_queue_reverse g_queue_sort g_queue_unlink -#endif -#endif - -#if IN_HEADER(__G_RAND_H__) -#if IN_FILE(__G_RAND_C__) g_rand_copy g_rand_double g_rand_double_range @@ -1053,11 +814,6 @@ g_random_int_range g_random_set_seed g_rand_set_seed g_rand_set_seed_array -#endif -#endif - -#if IN_HEADER(__G_REL_H__) -#if IN_FILE(__G_REL_C__) g_relation_count g_relation_delete g_relation_destroy @@ -1069,18 +825,13 @@ g_relation_print g_relation_select g_tuples_destroy g_tuples_index -#endif -#endif - -#if IN_HEADER(__G_SCANNER_H__) -#if IN_FILE(__G_SCANNER_C__) g_scanner_cur_line g_scanner_cur_position g_scanner_cur_token g_scanner_cur_value g_scanner_destroy g_scanner_eof -g_scanner_error G_GNUC_PRINTF(2,3) +g_scanner_error g_scanner_get_next_token g_scanner_input_file g_scanner_input_text @@ -1094,12 +845,7 @@ g_scanner_scope_remove_symbol g_scanner_set_scope g_scanner_sync_file_offset g_scanner_unexp_token -g_scanner_warn G_GNUC_PRINTF(2,3) -#endif -#endif - -#if IN_HEADER(__G_SEQUENCE_H__) -#if IN_FILE(__G_SEQUENCE_C__) +g_scanner_warn g_sequence_new g_sequence_free g_sequence_get_length @@ -1137,20 +883,10 @@ g_sequence_iter_move g_sequence_iter_get_sequence g_sequence_iter_compare g_sequence_range_get_midpoint -#endif -#endif - -#if IN_HEADER(__G_SHELL_H__) -#if IN_FILE(__G_SHELL_C__) g_shell_error_quark g_shell_parse_argv g_shell_quote g_shell_unquote -#endif -#endif - -#if IN_HEADER(__G_SLIST_H__) -#if IN_FILE(__G_SLIST_C__) g_slist_alloc g_slist_append g_slist_concat @@ -1171,25 +907,16 @@ g_slist_last g_slist_length g_slist_nth g_slist_nth_data -#ifndef G_DISABLE_DEPRECATED g_slist_pop_allocator -#endif g_slist_position g_slist_prepend -#ifndef G_DISABLE_DEPRECATED g_slist_push_allocator -#endif g_slist_remove g_slist_remove_all g_slist_remove_link g_slist_reverse g_slist_sort g_slist_sort_with_data -#endif -#endif - -#if IN_HEADER(__G_SPAWN_H__) -#if IN_FILE(__G_SPAWN_C__) #ifndef _WIN64 g_spawn_async PRIVATE g_spawn_async_with_pipes PRIVATE @@ -1210,11 +937,6 @@ g_spawn_command_line_async_utf8 g_spawn_command_line_sync_utf8 g_spawn_sync_utf8 #endif -#endif -#endif - -#if IN_HEADER(__G_STDIO_H__) -#if IN_FILE(__G_STDIO_C__) #if !defined(G_OS_UNIX) || defined(G_STDIO_NO_WRAP_ON_UNIX) /* gstdio wrappers */ g_chmod @@ -1233,85 +955,68 @@ g_access g_chdir g_unlink g_rmdir -#endif -#endif - -#if IN_HEADER(__G_STRFUNCS_H__) -#if IN_FILE(__G_STRFUNCS_C__) -g_ascii_digit_value G_GNUC_CONST +g_ascii_digit_value g_ascii_dtostr g_ascii_formatd -g_ascii_strdown G_GNUC_MALLOC +g_ascii_strdown g_ascii_strtod g_ascii_strtoull g_ascii_strtoll -g_ascii_strup G_GNUC_MALLOC -g_ascii_tolower G_GNUC_CONST -g_ascii_toupper G_GNUC_CONST -g_ascii_xdigit_value G_GNUC_CONST +g_ascii_strup +g_ascii_tolower +g_ascii_toupper +g_ascii_xdigit_value g_ascii_strcasecmp g_ascii_strncasecmp -g_memdup G_GNUC_MALLOC +g_memdup g_stpcpy g_strcanon g_strchomp g_strchug -g_strcompress G_GNUC_MALLOC -g_strconcat G_GNUC_MALLOC G_GNUC_NULL_TERMINATED +g_strcompress +g_strconcat g_strdelimit -g_strdup G_GNUC_MALLOC -g_strdup_printf G_GNUC_PRINTF(1,2) G_GNUC_MALLOC -g_strdupv G_GNUC_MALLOC -g_strdup_vprintf G_GNUC_MALLOC -g_strerror G_GNUC_CONST -g_strescape G_GNUC_MALLOC +g_strdup +g_strdup_printf +g_strdupv +g_strdup_vprintf +g_strerror +g_strescape g_strfreev g_str_has_prefix g_str_has_suffix -g_strjoin G_GNUC_MALLOC G_GNUC_NULL_TERMINATED -g_strjoinv G_GNUC_MALLOC +g_strjoin +g_strjoinv g_strlcat g_strlcpy -g_strndup G_GNUC_MALLOC -g_strnfill G_GNUC_MALLOC +g_strndup +g_strnfill g_strreverse g_strrstr g_strrstr_len -g_strsignal G_GNUC_CONST -g_strsplit G_GNUC_MALLOC -g_strsplit_set G_GNUC_MALLOC +g_strsignal +g_strsplit +g_strsplit_set g_strstr_len g_strtod -#ifndef G_DISABLE_DEPRECATED g_strcasecmp g_strncasecmp g_strup g_strdown -#endif g_strv_length -g_strip_context G_GNUC_FORMAT(1) -g_dgettext G_GNUC_FORMAT(2) -g_dcgettext G_GNUC_FORMAT(2) -g_dngettext G_GNUC_FORMAT(3) -g_dpgettext G_GNUC_FORMAT(2) -g_dpgettext2 G_GNUC_FORMAT(3) -#endif -#endif - -#if IN_HEADER(__G_URI_FUNCS_H__) -#if IN_FILE(__G_URI_FUNCS_C__) -g_uri_unescape_string -g_uri_unescape_segment -g_uri_parse_scheme -g_uri_escape_string -#endif -#endif - -#if IN_HEADER(__G_STRING_H__) -#if IN_FILE(__G_STRING_C__) +g_strip_context +g_dgettext +g_dcgettext +g_dngettext +g_dpgettext +g_dpgettext2 +g_uri_unescape_string +g_uri_unescape_segment +g_uri_parse_scheme +g_uri_escape_string g_string_append g_string_append_len -g_string_append_printf G_GNUC_PRINTF(2,3) +g_string_append_printf g_string_append_unichar g_string_append_vprintf g_string_ascii_down @@ -1339,46 +1044,27 @@ g_string_prepend g_string_prepend_c g_string_prepend_len g_string_prepend_unichar -g_string_printf G_GNUC_PRINTF(2,3) +g_string_printf g_string_set_size g_string_sized_new g_string_truncate g_string_append_uri_escaped -#ifndef G_DISABLE_DEPRECATED g_string_down g_string_up -#endif g_string_vprintf -#ifdef INCLUDE_INTERNAL_SYMBOLS - /* these are not internal, but we don't want to alias them */ g_string_append_c -#endif -#endif -#endif - -#if IN_HEADER(__G_BITLOCK_H__) -#if IN_FILE(__G_BITLOCK_C__) g_bit_lock g_bit_trylock g_bit_unlock -#endif -#endif - -#if IN_HEADER(__G_THREAD_H__) -#if IN_FILE(__G_THREAD_C__) g_once_impl g_once_init_enter_impl g_once_init_leave -#ifdef INCLUDE_INTERNAL_SYMBOLS g_thread_init_glib g_once_init_enter -#endif -#ifdef INCLUDE_VARIABLES g_thread_functions_for_glib_use g_threads_got_initialized g_thread_use_default_impl g_thread_gettime -#endif g_thread_create_full g_thread_error_quark g_thread_exit @@ -1409,11 +1095,6 @@ g_static_rw_lock_writer_trylock g_static_rw_lock_writer_unlock g_thread_foreach g_thread_get_initialized -#endif -#endif - -#if IN_HEADER(__G_THREADPOOL_H__) -#if IN_FILE(__G_THREADPOOL_C__) g_thread_pool_free g_thread_pool_get_max_threads g_thread_pool_get_max_unused_threads @@ -1428,28 +1109,19 @@ g_thread_pool_set_max_idle_time g_thread_pool_stop_unused_threads g_thread_pool_unprocessed g_thread_pool_set_sort_function -#endif -#endif - -#if IN_HEADER(__G_TEST_UTILS_H__) -#if IN_FILE(__G_MESSAGES_C__) g_test_log_set_fatal_handler -#endif -#if IN_FILE(__G_TEST_UTILS_C__) -g_assertion_message G_GNUC_NORETURN -g_assertion_message_cmpnum G_GNUC_NORETURN -g_assertion_message_cmpstr G_GNUC_NORETURN -g_assertion_message_expr G_GNUC_NORETURN -g_assertion_message_error G_GNUC_NORETURN +g_assertion_message +g_assertion_message_cmpnum +g_assertion_message_cmpstr +g_assertion_message_expr +g_assertion_message_error g_strcmp0 g_test_add_data_func g_test_add_func g_test_add_vtable g_test_bug g_test_bug_base -#ifdef INCLUDE_VARIABLES g_test_config_vars -#endif g_test_create_case g_test_create_suite g_test_fail @@ -1481,11 +1153,6 @@ g_test_trap_assertions g_test_trap_fork g_test_trap_has_passed g_test_trap_reached_timeout -#endif -#endif - -#if IN_HEADER(__G_TIMER_H__) -#if IN_FILE(__G_TIMER_C__) g_timer_continue g_timer_destroy g_timer_elapsed @@ -1495,13 +1162,8 @@ g_timer_start g_timer_stop g_time_val_add g_time_val_from_iso8601 -g_time_val_to_iso8601 G_GNUC_MALLOC +g_time_val_to_iso8601 g_usleep -#endif -#endif - -#if IN_HEADER(__G_TREE_H__) -#if IN_FILE(__G_TREE_C__) g_tree_destroy g_tree_foreach g_tree_height @@ -1518,75 +1180,48 @@ g_tree_remove g_tree_replace g_tree_search g_tree_steal -#ifndef G_DISABLE_DEPRECATED g_tree_traverse -#endif -#endif -#endif - -#if IN_HEADER(__G_UNICODE_H__) -#if IN_FILE(__G_UNIBREAK_C__) -g_unichar_break_type G_GNUC_CONST -#endif -#endif - -#if IN_HEADER(__G_UNICODE_H__) -#if IN_FILE(__G_UNICOLLATE_C__) +g_unichar_break_type g_utf8_collate -g_utf8_collate_key G_GNUC_MALLOC -g_utf8_collate_key_for_filename G_GNUC_MALLOC -#endif -#endif - -#if IN_HEADER(__G_UNICODE_H__) -#if IN_FILE(__G_UNIDECOMP_C__) -g_unicode_canonical_decomposition G_GNUC_MALLOC +g_utf8_collate_key +g_utf8_collate_key_for_filename +g_unicode_canonical_decomposition g_unicode_canonical_ordering -g_unichar_combining_class G_GNUC_CONST +g_unichar_combining_class g_utf8_normalize -#endif -#endif - -#if IN_HEADER(__G_UNICODE_H__) -#if IN_FILE(__G_UNIPROP_C__) -g_unichar_isalnum G_GNUC_CONST -g_unichar_isalpha G_GNUC_CONST -g_unichar_iscntrl G_GNUC_CONST -g_unichar_isdefined G_GNUC_CONST -g_unichar_isdigit G_GNUC_CONST -g_unichar_isgraph G_GNUC_CONST -g_unichar_islower G_GNUC_CONST -g_unichar_isprint G_GNUC_CONST -g_unichar_ispunct G_GNUC_CONST -g_unichar_isspace G_GNUC_CONST -g_unichar_istitle G_GNUC_CONST -g_unichar_isupper G_GNUC_CONST -g_unichar_iswide G_GNUC_CONST -g_unichar_iswide_cjk G_GNUC_CONST -g_unichar_isxdigit G_GNUC_CONST -g_unichar_iszerowidth G_GNUC_CONST -g_unichar_tolower G_GNUC_CONST -g_unichar_totitle G_GNUC_CONST -g_unichar_toupper G_GNUC_CONST -g_unichar_ismark G_GNUC_CONST +g_unichar_isalnum +g_unichar_isalpha +g_unichar_iscntrl +g_unichar_isdefined +g_unichar_isdigit +g_unichar_isgraph +g_unichar_islower +g_unichar_isprint +g_unichar_ispunct +g_unichar_isspace +g_unichar_istitle +g_unichar_isupper +g_unichar_iswide +g_unichar_iswide_cjk +g_unichar_isxdigit +g_unichar_iszerowidth +g_unichar_tolower +g_unichar_totitle +g_unichar_toupper +g_unichar_ismark g_unichar_get_mirror_char g_unichar_get_script -g_unichar_digit_value G_GNUC_CONST -g_unichar_xdigit_value G_GNUC_CONST -g_unichar_type G_GNUC_CONST -g_utf8_casefold G_GNUC_MALLOC -g_utf8_strup G_GNUC_MALLOC -g_utf8_strdown G_GNUC_MALLOC -#endif -#endif - -#if IN_HEADER(__G_UNICODE_H__) -#if IN_FILE(__G_UTF8_C__) +g_unichar_digit_value +g_unichar_xdigit_value +g_unichar_type +g_utf8_casefold +g_utf8_strup +g_utf8_strdown g_get_charset -g_ucs4_to_utf16 G_GNUC_MALLOC -g_ucs4_to_utf8 G_GNUC_MALLOC -g_utf16_to_ucs4 G_GNUC_MALLOC -g_utf16_to_utf8 G_GNUC_MALLOC +g_ucs4_to_utf16 +g_ucs4_to_utf8 +g_utf16_to_ucs4 +g_utf16_to_utf8 g_utf8_find_next_char g_utf8_find_prev_char g_utf8_get_char @@ -1599,48 +1234,29 @@ g_utf8_strlen g_utf8_strncpy g_utf8_strrchr g_utf8_strreverse -g_utf8_to_ucs4 G_GNUC_MALLOC -g_utf8_to_ucs4_fast G_GNUC_MALLOC -g_utf8_to_utf16 G_GNUC_MALLOC +g_utf8_to_ucs4 +g_utf8_to_ucs4_fast +g_utf8_to_utf16 g_utf8_validate g_unichar_to_utf8 g_unichar_validate -#endif -#endif - -#if IN_HEADER(__GLIBINTL_H__) -#if IN_FILE(__G_UTILS_C__) -glib_pgettext G_GNUC_FORMAT(1) -glib_gettext G_GNUC_FORMAT(1) +glib_pgettext +glib_gettext #ifdef G_OS_WIN32 _glib_get_locale_dir #endif -#endif -#endif - -#if IN_HEADER(__G_HASH_H__) -#if IN_FILE(__G_UTILS_C__) g_int_equal g_int_hash g_int64_equal g_int64_hash g_double_equal g_double_hash -g_direct_equal G_GNUC_CONST -g_direct_hash G_GNUC_CONST -#endif -#if IN_FILE(__G_STRING_C__) +g_direct_equal +g_direct_hash g_str_equal g_str_hash -#endif -#endif - -#if IN_HEADER(__G_UTILS_H__) -#if IN_FILE(__G_UTILS_C__) g_atexit -#ifndef G_DISABLE_DEPRECATED g_basename -#endif g_get_application_name #ifndef _WIN64 g_find_program_in_path PRIVATE @@ -1648,11 +1264,9 @@ g_get_current_dir PRIVATE g_getenv PRIVATE g_unsetenv PRIVATE g_get_home_dir PRIVATE -#endif -g_get_host_name -#ifndef _WIN64 g_setenv PRIVATE #endif +g_get_host_name g_listenv g_get_environ #ifdef G_OS_WIN32 @@ -1698,13 +1312,12 @@ g_get_user_name_utf8 glib_check_version g_nullify_pointer g_parse_debug_string -g_path_get_basename G_GNUC_MALLOC -g_path_get_dirname G_GNUC_MALLOC +g_path_get_basename +g_path_get_dirname g_path_is_absolute g_path_skip_root g_set_application_name g_set_prgname -#ifdef INCLUDE_INTERNAL_SYMBOLS g_bit_nth_lsf g_bit_nth_msf g_bit_storage @@ -1713,12 +1326,6 @@ g_trash_stack_peek g_trash_stack_pop g_trash_stack_push g_get_codeset -#endif -#endif -#endif - -#if IN_HEADER(__G_REGEX_H__) -#if IN_FILE(__G_REGEX_C__) g_regex_error_quark g_regex_new g_regex_ref @@ -1755,11 +1362,6 @@ g_match_info_fetch_pos g_match_info_fetch_named g_match_info_fetch_named_pos g_match_info_fetch_all -#endif -#endif - -#if IN_HEADER(__G_VARIANT_TYPE_H__) -#if IN_FILE(__G_VARIANT_TYPE_C__) g_variant_type_string_is_valid g_variant_type_string_scan g_variant_type_free @@ -1790,11 +1392,6 @@ g_variant_type_new_maybe g_variant_type_new_tuple g_variant_type_new_dict_entry g_variant_type_checked_ -#endif -#endif - -#if IN_HEADER(__G_VARIANT_H__) -#if IN_FILE(__G_VARIANT_CORE_C__) g_variant_unref g_variant_ref g_variant_ref_sink @@ -1805,16 +1402,12 @@ g_variant_get_size g_variant_get_data g_variant_store g_variant_is_normal_form -#endif - -#if IN_FILE(__G_VARIANT_C__) g_variant_get_type g_variant_get_type_string g_variant_is_of_type g_variant_is_container g_variant_classify g_variant_compare - g_variant_new_boolean g_variant_new_byte g_variant_new_int16 @@ -1834,7 +1427,6 @@ g_variant_new_variant g_variant_new_strv g_variant_new_bytestring g_variant_new_bytestring_array - g_variant_get_boolean g_variant_get_byte g_variant_get_int16 @@ -1854,28 +1446,22 @@ g_variant_get_bytestring g_variant_dup_bytestring g_variant_get_bytestring_array g_variant_dup_bytestring_array - g_variant_new_maybe g_variant_new_array g_variant_new_tuple g_variant_new_dict_entry - g_variant_get_maybe g_variant_get_fixed_array - g_variant_print g_variant_print_string - g_variant_hash g_variant_equal - g_variant_iter_copy g_variant_iter_free g_variant_iter_init g_variant_iter_n_children g_variant_iter_new g_variant_iter_next_value - g_variant_builder_add_value g_variant_builder_init g_variant_builder_clear @@ -1885,35 +1471,24 @@ g_variant_builder_end g_variant_builder_new g_variant_builder_unref g_variant_builder_ref - g_variant_new_va g_variant_get_va g_variant_new g_variant_get - g_variant_builder_add g_variant_get_child g_variant_lookup_value g_variant_lookup g_variant_iter_next g_variant_iter_loop - g_variant_new_from_data g_variant_get_normal_form g_variant_byteswap -#endif - -#if IN_FILE(__G_VARIANT_PARSER_C__) g_variant_new_parsed g_variant_new_parsed_va g_variant_builder_add_parsed g_variant_parse g_variant_parser_get_error_quark -#endif -#endif - -#if IN_HEADER(__G_VARIANT_TYPE_INFO_H__) -#if IN_FILE(__G_VARIANT_TYPE_INFO_C__) g_variant_type_info_get_type_string g_variant_type_info_query g_variant_type_info_element @@ -1924,11 +1499,6 @@ g_variant_type_info_get g_variant_type_info_ref g_variant_type_info_unref g_variant_type_info_assert_no_infos -#endif -#endif - -#if IN_HEADER(__G_VARIANT_SERIALISER_H__) -#if IN_FILE(__G_VARIANT_SERIALISER_C__) g_variant_serialised_byteswap g_variant_serialised_get_child g_variant_serialised_is_normal @@ -1938,18 +1508,8 @@ g_variant_serialiser_is_signature g_variant_serialiser_is_string g_variant_serialiser_needed_size g_variant_serialiser_serialise -#endif -#endif - -#if IN_HEADER(__G_VARIANT_INTERNAL_H__) -#if IN_FILE(__G_VARIANT_C__) g_variant_format_string_scan_type g_variant_format_string_scan -#endif -#endif - -#if IN_HEADER(__G_WIN32_H__) -#if IN_FILE(__G_WIN32_H__) #ifdef G_OS_WIN32 g_win32_error_message g_win32_ftruncate @@ -1966,21 +1526,11 @@ g_win32_get_windows_version g_win32_getlocale g_win32_locale_filename_from_utf8 #endif -#endif -#endif - -#if IN_HEADER(__G_HOST_UTILS_H__) -#if IN_FILE(__G_HOST_UTILS_C__) g_hostname_is_non_ascii g_hostname_is_ascii_encoded g_hostname_is_ip_address g_hostname_to_ascii g_hostname_to_unicode -#endif -#endif - -#if IN_HEADER(__G_UNIX_H__) -#if IN_FILE(__G_UNIX_C__) #ifdef G_OS_UNIX g_unix_error_quark g_unix_open_pipe @@ -1988,10 +1538,6 @@ g_unix_set_fd_nonblocking g_unix_signal_source_new g_unix_signal_add_watch_full #endif -#endif -#endif - -#ifdef INCLUDE_VARIABLES g_ascii_table g_utf8_skip g_idle_funcs @@ -2006,4 +1552,3 @@ glib_micro_version glib_minor_version glib_on_error_halt g_mem_gc_friendly -#endif diff --git a/gobject/abicheck.sh b/gobject/abicheck.sh index e2711ef32..7210bd6c3 100755 --- a/gobject/abicheck.sh +++ b/gobject/abicheck.sh @@ -5,7 +5,7 @@ egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glib/glibconfig.h" > glibconfig. INCLUDES="-include ${top_builddir:-..}/config.h" INCLUDES="$INCLUDES -include glibconfig.cpp" -cpp -DINCLUDE_VARIABLES -P $INCLUDES -DALL_FILES ${srcdir:-.}/gobject.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi +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 --git a/gobject/gobject.symbols b/gobject/gobject.symbols index e4722be43..b72176a89 100644 --- a/gobject/gobject.symbols +++ b/gobject/gobject.symbols @@ -1,19 +1,8 @@ /* This file lists all exported symbols. It is used to generate * the gobject.def file used to control exports on Windows. - * - * Every symbol must be included in the right - * #ifdef IN_HEADER(sym) #endif and - * #ifdef IN_FILE(sym) #endif sections. */ -#ifdef ALL_FILES -#define IN_FILE(x) 1 -#define IN_HEADER(x) 1 -#endif - -#if IN_HEADER(__G_BINDING_H__) -#if IN_FILE(__G_BINDING_C__) -g_binding_flags_get_type G_GNUC_CONST -g_binding_get_type G_GNUC_CONST +g_binding_flags_get_type +g_binding_get_type g_binding_get_flags g_binding_get_source g_binding_get_target @@ -22,42 +11,30 @@ g_binding_get_target_property g_object_bind_property g_object_bind_property_full g_object_bind_property_with_closures -#endif -#endif - -#if IN_HEADER(__G_BOXED_H__) -#if IN_FILE(__G_BOXED_C__) g_boxed_copy g_boxed_free g_boxed_type_register_static -g_date_get_type G_GNUC_CONST -g_date_time_get_type G_GNUC_CONST -g_gstring_get_type G_GNUC_CONST -g_strv_get_type G_GNUC_CONST -g_hash_table_get_type G_GNUC_CONST -g_array_get_type G_GNUC_CONST -g_byte_array_get_type G_GNUC_CONST -g_error_get_type G_GNUC_CONST -g_ptr_array_get_type G_GNUC_CONST -g_regex_get_type G_GNUC_CONST -g_variant_type_get_gtype G_GNUC_CONST -g_closure_get_type G_GNUC_CONST -g_value_get_type G_GNUC_CONST -g_value_array_get_type G_GNUC_CONST +g_date_get_type +g_date_time_get_type +g_gstring_get_type +g_strv_get_type +g_hash_table_get_type +g_array_get_type +g_byte_array_get_type +g_error_get_type +g_ptr_array_get_type +g_regex_get_type +g_variant_type_get_gtype +g_closure_get_type +g_value_get_type +g_value_array_get_type g_value_set_boxed g_value_take_boxed g_value_dup_boxed g_value_get_boxed g_value_set_static_boxed -#ifndef G_DISABLE_DEPRECATED g_value_set_boxed_take_ownership -g_variant_get_gtype G_GNUC_CONST -#endif -#endif -#endif - -#if IN_HEADER(__G_MARSHAL_H__) -#if IN_FILE(__G_SIGNAL_C__) +g_variant_get_gtype g_cclosure_marshal_BOOLEAN__FLAGS g_cclosure_marshal_BOOLEAN__BOXED_BOXED g_cclosure_marshal_STRING__OBJECT_POINTER @@ -80,11 +57,6 @@ g_cclosure_marshal_VOID__UINT_POINTER g_cclosure_marshal_VOID__ULONG g_cclosure_marshal_VOID__VARIANT g_cclosure_marshal_VOID__VOID -#endif -#endif - -#if IN_HEADER(__G_CLOSURE_H__) -#if IN_FILE(__G_CLOSURE_C__) g_cclosure_new g_cclosure_new_swap g_closure_add_finalize_notifier @@ -102,11 +74,6 @@ g_closure_sink g_closure_unref g_signal_type_cclosure_new g_cclosure_marshal_generic -#endif -#endif - -#if IN_HEADER(__G_ENUMS_H__) -#if IN_FILE(__G_ENUMS_C__) g_enum_complete_type_info g_enum_get_value g_enum_get_value_by_name @@ -121,20 +88,10 @@ g_value_set_enum g_value_set_flags g_value_get_enum g_value_get_flags -#endif -#endif - -#if IN_HEADER(__G_SOURCECLOSURE_H__) -#if IN_FILE(__G_SOURCECLOSURE_C__) g_io_channel_get_type g_io_condition_get_type g_source_set_closure g_source_set_dummy_callback -#endif -#endif - -#if IN_HEADER(__G_OBJECT_H__) -#if IN_FILE(__G_OBJECT_C__) g_cclosure_new_object g_cclosure_new_object_swap g_closure_new_object @@ -145,10 +102,10 @@ g_object_class_install_property g_object_class_install_properties g_object_class_list_properties g_object_class_override_property -g_object_connect G_GNUC_NULL_TERMINATED -g_object_disconnect G_GNUC_NULL_TERMINATED +g_object_connect +g_object_disconnect g_object_freeze_notify -g_object_get G_GNUC_NULL_TERMINATED +g_object_get g_object_get_data g_object_get_property g_object_get_qdata @@ -169,7 +126,7 @@ g_object_ref g_object_unref g_object_remove_weak_pointer g_object_run_dispose -g_object_set G_GNUC_NULL_TERMINATED +g_object_set g_object_set_data g_object_set_data_full g_object_set_property @@ -189,16 +146,9 @@ g_value_set_object g_value_dup_object g_value_take_object g_clear_object -#ifndef G_DISABLE_DEPRECATED g_value_set_object_take_ownership g_object_compat_control -#endif g_signal_connect_object -#endif -#endif - -#if IN_HEADER(__G_PARAMSPECS_H__) -#if IN_FILE(__G_PARAMSPECS_C__) g_param_spec_boolean g_param_spec_boxed g_param_spec_char @@ -222,11 +172,6 @@ g_param_spec_ulong g_param_spec_unichar g_param_spec_value_array g_param_spec_variant -#endif -#endif - -#if IN_HEADER(__G_PARAM_H__) -#if IN_FILE(__G_PARAM_C__) g_param_spec_get_blurb g_param_spec_get_name g_param_spec_get_nick @@ -256,14 +201,7 @@ g_value_get_param g_value_set_param g_value_dup_param g_value_take_param -#ifndef G_DISABLE_DEPRECATED g_value_set_param_take_ownership -#endif -#endif -#endif - -#if IN_HEADER(__G_VALUETYPES_H__) -#if IN_FILE(__G_VALUETYPES_C__) g_pointer_type_register_static g_strdup_value_contents g_value_set_boolean @@ -276,9 +214,7 @@ g_value_set_long g_value_set_pointer g_value_set_static_string g_value_set_string -#ifndef G_DISABLE_DEPRECATED g_value_set_string_take_ownership -#endif g_value_set_uchar g_value_set_uint g_value_set_uint64 @@ -305,11 +241,6 @@ g_value_get_variant g_value_dup_variant g_value_set_variant g_value_take_variant -#endif -#endif - -#if IN_HEADER(__G_SIGNAL_H__) -#if IN_FILE(__G_SIGNAL_C__) g_signal_accumulator_first_wins g_signal_accumulator_true_handled g_signal_add_emission_hook @@ -347,18 +278,13 @@ g_signal_query g_signal_remove_emission_hook g_signal_stop_emission g_signal_stop_emission_by_name -#endif -#endif - -#if IN_HEADER(__G_TYPE_H__) -#if IN_FILE(__G_TYPE_C__) g_type_add_class_cache_func g_type_add_interface_check g_type_add_interface_dynamic g_type_add_interface_static g_type_check_class_cast g_type_check_class_is_a -g_type_check_instance +g_type_check_instance g_type_check_instance_cast g_type_check_instance_is_a g_type_check_is_value_type @@ -411,24 +337,14 @@ g_type_test_flags g_type_value_table_peek g_type_class_get_private g_type_add_class_private -#endif -#endif - -#if IN_HEADER(__G_TYPE_MODULE_H__) -#if IN_FILE(__G_TYPE_MODULE_C__) g_type_module_add_interface -g_type_module_get_type G_GNUC_CONST +g_type_module_get_type g_type_module_register_enum g_type_module_register_flags g_type_module_register_type g_type_module_set_name g_type_module_unuse g_type_module_use -#endif -#endif - -#if IN_HEADER(__G_VALUE_ARRAY_H__) -#if IN_FILE(__G_VALUE_ARRAY_C__) g_value_array_append g_value_array_copy g_value_array_free @@ -439,21 +355,11 @@ g_value_array_prepend g_value_array_remove g_value_array_sort g_value_array_sort_with_data -#endif -#endif - -#if IN_HEADER(__G_TYPE_PLUGIN_H__) -#if IN_FILE(__G_TYPE_PLUGIN_C__) g_type_plugin_complete_interface_info g_type_plugin_complete_type_info -g_type_plugin_get_type G_GNUC_CONST +g_type_plugin_get_type g_type_plugin_unuse g_type_plugin_use -#endif -#endif - -#if IN_HEADER(__G_VALUE_H__) -#if IN_FILE(__G_VALUE_C__) g_value_copy g_value_fits_pointer g_value_init @@ -465,12 +371,7 @@ g_value_type_compatible g_value_type_transformable g_value_unset g_value_set_instance -#endif -#endif - -#ifdef INCLUDE_VARIABLES g_param_spec_types -#endif #ifdef INCLUDE_INTERNAL_SYMBOLS g_slist_remove_all PRIVATE g_unichar_validate PRIVATE