Merge branch 'le-be-swap-gcc' into 'main'

Fix GCC version detection for GUINT*_SWAP_LE_BE

See merge request GNOME/glib!4450
This commit is contained in:
Philip Withnall 2025-01-03 18:54:26 +00:00
commit 92528d3802

View File

@ -247,7 +247,7 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str,
*/ */
#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__) #if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
# if __GNUC__ >= 4 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 3 # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
# define GUINT32_SWAP_LE_BE(val) ((guint32) __builtin_bswap32 ((guint32) (val))) # define GUINT32_SWAP_LE_BE(val) ((guint32) __builtin_bswap32 ((guint32) (val)))
# define GUINT64_SWAP_LE_BE(val) ((guint64) __builtin_bswap64 ((guint64) (val))) # define GUINT64_SWAP_LE_BE(val) ((guint64) __builtin_bswap64 ((guint64) (val)))
# endif # endif