luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 01:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hmac-introspection' into 'main'

Browse Source 
ghmac: Add a boxed type for GHmac and fix introspection build accordingly

See merge request GNOME/glib!3711
This commit is contained in:
Philip Withnall 2023-11-21 12:55:30 +00:00
commit 69b83a830c
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gobject/gboxed.c
View File

@ -138,6 +138,7 @@ G_DEFINE_BOXED_TYPE (GTimeZone, g_time_zone, g_time_zone_ref, g_time_zone_unref)
G_DEFINE_BOXED_TYPE (GKeyFile, g_key_file, g_key_file_ref, g_key_file_unref) G_DEFINE_BOXED_TYPE (GKeyFile, g_key_file, g_key_file_ref, g_key_file_unref)
G_DEFINE_BOXED_TYPE (GMappedFile, g_mapped_file, g_mapped_file_ref, g_mapped_file_unref) G_DEFINE_BOXED_TYPE (GMappedFile, g_mapped_file, g_mapped_file_ref, g_mapped_file_unref)
G_DEFINE_BOXED_TYPE (GBookmarkFile, g_bookmark_file, g_bookmark_file_copy, g_bookmark_file_free) G_DEFINE_BOXED_TYPE (GBookmarkFile, g_bookmark_file, g_bookmark_file_copy, g_bookmark_file_free)
G_DEFINE_BOXED_TYPE (GHmac, g_hmac, g_hmac_ref, g_hmac_unref)
G_DEFINE_BOXED_TYPE (GMainLoop, g_main_loop, g_main_loop_ref, g_main_loop_unref) G_DEFINE_BOXED_TYPE (GMainLoop, g_main_loop, g_main_loop_ref, g_main_loop_unref)
G_DEFINE_BOXED_TYPE (GMainContext, g_main_context, g_main_context_ref, g_main_context_unref) G_DEFINE_BOXED_TYPE (GMainContext, g_main_context, g_main_context_ref, g_main_context_unref)

11
gobject/glib-types.h
View File

@ -336,6 +336,15 @@ typedef gsize GType;
*/ */
#define G_TYPE_BOOKMARK_FILE (g_bookmark_file_get_type ()) #define G_TYPE_BOOKMARK_FILE (g_bookmark_file_get_type ())
/**
* G_TYPE_HMAC:
*
* The #GType for a boxed type holding a #GHmac.
*
* Since: 2.80
*/
#define G_TYPE_HMAC (g_hmac_get_type ())
GOBJECT_AVAILABLE_IN_ALL GOBJECT_AVAILABLE_IN_ALL
GType g_date_get_type (void) G_GNUC_CONST; GType g_date_get_type (void) G_GNUC_CONST;
GOBJECT_AVAILABLE_IN_ALL GOBJECT_AVAILABLE_IN_ALL
@ -400,6 +409,8 @@ GOBJECT_AVAILABLE_IN_2_70
GType g_pattern_spec_get_type (void) G_GNUC_CONST; GType g_pattern_spec_get_type (void) G_GNUC_CONST;
GOBJECT_AVAILABLE_IN_2_76 GOBJECT_AVAILABLE_IN_2_76
GType g_bookmark_file_get_type (void) G_GNUC_CONST; GType g_bookmark_file_get_type (void) G_GNUC_CONST;
GOBJECT_AVAILABLE_IN_2_80
GType g_hmac_get_type (void) G_GNUC_CONST;
GOBJECT_DEPRECATED_FOR('G_TYPE_VARIANT') GOBJECT_DEPRECATED_FOR('G_TYPE_VARIANT')
GType g_variant_get_gtype (void) G_GNUC_CONST; GType g_variant_get_gtype (void) G_GNUC_CONST;

1
gobject/meson.build
View File

@ -190,6 +190,7 @@ if enable_gir
'-DGLIB_COMPILATION', '-DGLIB_COMPILATION',
'-DGETTEXT_PACKAGE="dummy"', '-DGETTEXT_PACKAGE="dummy"',
'--symbol-prefix=glib', '--symbol-prefix=glib',
'--library-path=' + meson.current_build_dir(),
'--library=gobject-2.0', '--library=gobject-2.0',
], ],
) )