luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-02 14:19:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'msort-cheri' into 'main'

Browse Source 
Allow using msort_r CHERI-enabled architectures

See merge request GNOME/glib!3243
This commit is contained in:
Philip Withnall
2023-02-06 14:04:18 +00:00
parent bd8b756853 d2bbd69fd5
commit 361745149f
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@@ -1479,8 +1479,6 @@ long_long_align = cc.alignment('long long')
# be 64-bit in C99, and it is available on all supported compilers
sizet_align = cc.alignment('size_t')
glib_conf.set('ALIGNOF_UNSIGNED_LONG', long_align)
glib_conf.set('SIZEOF_CHAR', char_size)
glib_conf.set('SIZEOF_INT', int_size)
glib_conf.set('SIZEOF_SHORT', short_size)
@@ -1534,7 +1532,6 @@ glibconfig_conf.set('gint32', gint32)
glibconfig_conf.set_quoted('gint32_modifier', gint32_modifier)
glibconfig_conf.set_quoted('gint32_format', gint32_format)
glibconfig_conf.set_quoted('guint32_format', guint32_format)
glib_conf.set('ALIGNOF_GUINT32', guint32_align)
if int_size == 8
gint64 = 'int'
@@ -1573,7 +1570,6 @@ glibconfig_conf.set_quoted('gint64_format', gint64_format)
glibconfig_conf.set_quoted('guint64_format', guint64_format)
glibconfig_conf.set('gint64_constant', gint64_constant)
glibconfig_conf.set('guint64_constant', guint64_constant)
glib_conf.set('ALIGNOF_GUINT64', guint64_align)
if host_system == 'windows'
glibconfig_conf.set('g_pid_type', 'void*')