merge GVariantType

[platform/upstream/glib.git] / glib / glib.symbols

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 33e2fa1..ad2b509 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -17,6 +17,9 @@ g_array_append_vals
 g_array_free
 g_array_insert_vals
 g_array_new
+g_array_ref
+g_array_unref
+g_array_get_element_size
 g_array_prepend_vals
 g_array_remove_index
 g_array_remove_index_fast
@@ -27,6 +30,8 @@ g_array_sort
 g_array_sort_with_data
 g_byte_array_append
 g_byte_array_free
+g_byte_array_unref
+g_byte_array_ref
 g_byte_array_new
 g_byte_array_prepend
 g_byte_array_remove_index
@@ -39,7 +44,11 @@ g_byte_array_sort_with_data
 g_ptr_array_add
 g_ptr_array_foreach
 g_ptr_array_free
+g_ptr_array_unref
+g_ptr_array_ref
 g_ptr_array_new
+g_ptr_array_new_with_free_func
+g_ptr_array_set_free_func
 g_ptr_array_remove
 g_ptr_array_remove_fast
 g_ptr_array_remove_index
@@ -111,6 +120,7 @@ g_base64_encode_close
 g_base64_encode G_GNUC_MALLOC
 g_base64_decode_step
 g_base64_decode G_GNUC_MALLOC
+g_base64_decode_inplace
 #endif
 #endif
 
@@ -179,6 +189,7 @@ g_checksum_new
 g_checksum_copy
 g_checksum_free
 g_checksum_update
+g_checksum_reset
 g_checksum_get_string
 g_checksum_get_digest
 g_compute_checksum_for_data
@@ -213,10 +224,12 @@ 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
+#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 
+#endif
 #ifdef G_OS_WIN32
 g_filename_from_uri_utf8 G_GNUC_MALLOC
 g_filename_from_utf8_utf8
@@ -315,8 +328,10 @@ g_date_valid_year G_GNUC_CONST
 #if IN_HEADER(__G_DIR_H__)
 #if IN_FILE(__G_DIR_C__)
 g_dir_close
+#ifndef _WIN64
 g_dir_open PRIVATE
 g_dir_read_name PRIVATE
+#endif
 #ifdef G_OS_WIN32
 g_dir_open_utf8
 g_dir_read_name_utf8
@@ -333,8 +348,10 @@ g_error_free
 g_error_matches
 g_error_new G_GNUC_PRINTF(3,4)
 g_error_new_literal
+g_error_new_valist
 g_propagate_error
 g_set_error G_GNUC_PRINTF(4,5)
+g_set_error_literal
 g_prefix_error G_GNUC_PRINTF(2,3)
 g_propagate_prefixed_error G_GNUC_PRINTF(3,4)
 #endif
@@ -348,13 +365,20 @@ g_build_path G_GNUC_MALLOC G_GNUC_NULL_TERMINATED
 g_build_pathv G_GNUC_MALLOC 
 g_file_error_from_errno
 g_file_error_quark
+#ifndef _WIN64
 g_file_get_contents PRIVATE
+#endif
 g_file_set_contents
+#ifndef _WIN64
 g_file_open_tmp PRIVATE
 g_file_test PRIVATE
+#endif
 g_file_read_link
 g_format_size_for_display
+#ifndef _WIN64
 g_mkstemp PRIVATE
+#endif
+g_mkstemp_full
 g_mkdir_with_parents
 #ifdef G_OS_WIN32
 g_file_get_contents_utf8
@@ -480,14 +504,18 @@ g_io_channel_new_file PRIVATE
 #ifdef G_OS_WIN32
 g_io_channel_unix_get_fd
 g_io_channel_unix_new
+#ifndef _WIN64
 g_io_channel_new_file PRIVATE
+#endif
 g_io_channel_new_file_utf8
 g_io_channel_win32_get_fd
 g_io_channel_win32_make_pollfd
 g_io_channel_win32_new_fd
 g_io_channel_win32_new_messages
 g_io_channel_win32_new_socket
-g_io_channel_win32_new_stream_socket
+#ifndef _WIN64
+g_io_channel_win32_new_stream_socket PRIVATE
+#endif
 g_io_channel_win32_poll
 g_io_channel_win32_set_debug
 #endif
@@ -595,11 +623,14 @@ g_main_context_find_source_by_funcs_user_data
 g_main_context_find_source_by_id
 g_main_context_find_source_by_user_data
 g_main_context_get_poll_func
+g_main_context_get_thread_default
 g_main_context_is_owner
 g_main_context_iteration
 g_main_context_new
 g_main_context_pending
+g_main_context_pop_thread_default
 g_main_context_prepare
+g_main_context_push_thread_default
 g_main_context_query
 g_main_context_ref
 g_main_context_release
@@ -656,9 +687,13 @@ g_timeout_source_new_seconds
 g_mapped_file_new G_GNUC_MALLOC
 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__)
@@ -669,8 +704,11 @@ g_markup_parse_context_free
 g_markup_parse_context_get_element
 g_markup_parse_context_get_element_stack
 g_markup_parse_context_get_position
+g_markup_parse_context_get_user_data
 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_vprintf_escaped
 g_markup_collect_attributes
@@ -826,6 +864,12 @@ 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
@@ -1053,13 +1097,19 @@ g_slist_sort_with_data
 
 #if IN_HEADER(__G_SPAWN_H__)
 #if IN_FILE(__G_SPAWN_C__)
+#ifndef _WIN64
 g_spawn_async PRIVATE
 g_spawn_async_with_pipes PRIVATE
+#endif
 g_spawn_close_pid
+#ifndef _WIN64
 g_spawn_command_line_async PRIVATE
 g_spawn_command_line_sync PRIVATE
+#endif
 g_spawn_error_quark
+#ifndef _WIN64
 g_spawn_sync PRIVATE
+#endif
 #ifdef G_OS_WIN32
 g_spawn_async_utf8
 g_spawn_async_with_pipes_utf8
@@ -1084,6 +1134,7 @@ g_lstat
 g_remove
 g_fopen
 g_freopen
+g_utime
 #endif
 g_access
 g_chdir
@@ -1145,7 +1196,11 @@ g_strup
 g_strdown
 #endif
 g_strv_length
-g_strip_context
+g_strip_context G_GNUC_FORMAT(1)
+g_dgettext G_GNUC_FORMAT(2)
+g_dngettext G_GNUC_FORMAT(3)
+g_dpgettext G_GNUC_FORMAT(2)
+g_dpgettext2 G_GNUC_FORMAT(3)
 #endif
 #endif
 
@@ -1253,6 +1308,7 @@ g_static_rw_lock_writer_lock
 g_static_rw_lock_writer_trylock
 g_static_rw_lock_writer_unlock
 g_thread_foreach
+g_thread_get_initialized
 #endif
 #endif
 
@@ -1276,18 +1332,24 @@ g_thread_pool_set_sort_function
 #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_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_get_root
@@ -1346,6 +1408,8 @@ g_tree_insert
 g_tree_lookup
 g_tree_lookup_extended
 g_tree_new
+g_tree_ref
+g_tree_unref
 g_tree_new_full
 g_tree_new_with_data
 g_tree_nnodes
@@ -1445,7 +1509,7 @@ g_unichar_validate
 
 #if IN_HEADER(__GLIBINTL_H__)
 #if IN_FILE(__G_UTILS_C__)
-glib_gettext
+glib_gettext G_GNUC_FORMAT(1)
 #endif
 #endif
 
@@ -1453,6 +1517,10 @@ glib_gettext
 #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
@@ -1465,13 +1533,17 @@ g_atexit
 g_basename
 #endif
 g_get_application_name
+#ifndef _WIN64
 g_find_program_in_path PRIVATE
 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_listenv
 #ifdef G_OS_WIN32
 g_find_program_in_path_utf8
@@ -1483,7 +1555,9 @@ g_get_home_dir_utf8
 #endif
 g_get_language_names
 g_get_prgname
+#ifndef _WIN64
 g_get_real_name PRIVATE
+#endif
 #ifdef G_OS_WIN32
 g_get_real_name_utf8
 #endif
@@ -1492,15 +1566,20 @@ g_get_system_data_dirs
 #ifdef G_OS_WIN32
 g_win32_get_system_data_dirs_for_module
 #endif
+#ifndef _WIN64
 g_get_tmp_dir PRIVATE
+#endif
 #ifdef G_OS_WIN32
 g_get_tmp_dir_utf8
 #endif
 g_get_user_cache_dir
 g_get_user_config_dir
 g_get_user_data_dir
+g_reload_user_special_dirs_cache
 g_get_user_special_dir
+#ifndef _WIN64
 g_get_user_name PRIVATE
+#endif
 #ifdef G_OS_WIN32
 g_get_user_name_utf8
 #endif
@@ -1565,15 +1644,53 @@ 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
+g_variant_type_copy
+g_variant_type_new
+g_variant_type_get_string_length
+g_variant_type_peek_string
+g_variant_type_dup_string
+g_variant_type_is_definite
+g_variant_type_is_container
+g_variant_type_is_basic
+g_variant_type_is_maybe
+g_variant_type_is_array
+g_variant_type_is_tuple
+g_variant_type_is_dict_entry
+g_variant_type_hash
+g_variant_type_equal
+g_variant_type_is_subtype_of
+g_variant_type_element
+g_variant_type_first
+g_variant_type_next
+g_variant_type_n_items
+g_variant_type_key
+g_variant_type_value
+g_variant_type_new_array
+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_WIN32_H__)
 #if IN_FILE(__G_WIN32_H__)
 #ifdef G_OS_WIN32
 g_win32_error_message
 g_win32_ftruncate
 g_win32_get_package_installation_directory_of_module
+#ifndef _WIN64
 g_win32_get_package_installation_directory PRIVATE
+#endif
 g_win32_get_package_installation_directory_utf8
+#ifndef _WIN64
 g_win32_get_package_installation_subdirectory PRIVATE
+#endif
 g_win32_get_package_installation_subdirectory_utf8
 g_win32_get_windows_version
 g_win32_getlocale
@@ -1582,11 +1699,13 @@ g_win32_locale_filename_from_utf8
 #endif
 #endif
 
-#if IN_HEADER(__G_I18N_H__)
-#if IN_FILE(__G_I18N_C__)
-g_gettext
-g_dgettext
-g_dpgettext
+#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