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 'wip/chergert/gvariant-padding' into 'main'

Browse Source 
gvariant: Add portable alignment fix for GVariant suffix

Closes #3486

See merge request GNOME/glib!4320
This commit is contained in:
Philip Withnall 2024-10-01 11:42:27 +00:00
commit a083ae415b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glib/gvariant-core.c
View File

@ -76,13 +76,12 @@ struct _GVariant
gatomicrefcount ref_count;
gsize depth;
#if g_macro__has_attribute(aligned)
guint8 suffix[] __attribute__((aligned(8)));
#elif defined _MSC_VER
__declspec(align (8)) guint8 suffix[];
#else
guint8 suffix[];
#if GLIB_SIZEOF_VOID_P == 4
/* Keep suffix aligned to 8 bytes */
guint _padding;
#endif
guint8 suffix[];
};
/* Ensure our suffix data aligns to largest guaranteed offset