Revert "stdlib.h: Fix qsort_r compatibility with GCC 12."

This reverts commit 43703bc489.

Reviewed by:	jrtc27
Differential Revision:	https://reviews.freebsd.org/D38216
This commit is contained in:
John Baldwin 2023-01-26 16:28:03 -08:00
parent e2d14a04c5
commit e5dc40935f

View file

@ -352,15 +352,9 @@ void __qsort_r_compat(void *, size_t, size_t, void *,
__sym_compat(qsort_r, __qsort_r_compat, FBSD_1.0);
#endif
#if defined(__generic) && !defined(__cplusplus)
#if __GNUC__ == 12
#define qsort_r(base, nel, width, arg4, arg5) \
__generic(arg5, int (void *, const void *, const void *), \
__qsort_r_compat, qsort_r)(base, nel, width, arg4, arg5)
#else
#define qsort_r(base, nel, width, arg4, arg5) \
__generic(arg5, int (*)(void *, const void *, const void *), \
__qsort_r_compat, qsort_r)(base, nel, width, arg4, arg5)
#endif
#elif defined(__cplusplus)
__END_DECLS
extern "C++" {