merge GVariantType
[platform/upstream/glib.git] / glib / glib.symbols
index 333164f..ad2b509 100644 (file)
@@ -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
@@ -339,6 +348,7 @@ 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
@@ -368,6 +378,7 @@ 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
@@ -612,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
@@ -673,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__)
@@ -1314,6 +1332,9 @@ 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
@@ -1387,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
@@ -1486,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
 
@@ -1494,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
@@ -1548,6 +1575,7 @@ g_get_tmp_dir_utf8
 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
@@ -1616,6 +1644,40 @@ 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
@@ -1637,6 +1699,16 @@ g_win32_locale_filename_from_utf8
 #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
+
 #ifdef INCLUDE_VARIABLES
 g_ascii_table
 g_utf8_skip