From e5dc40935f6e57c6d1034ae4dea021e677bbae18 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 26 Jan 2023 16:28:03 -0800
Subject: [PATCH] Revert "stdlib.h: Fix qsort_r compatibility with GCC 12."

This reverts commit 43703bc489ec504b947b869045c492ed38c1a69c.

Reviewed by:	jrtc27
Differential Revision:	https://reviews.freebsd.org/D38216
---
 include/stdlib.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/stdlib.h b/include/stdlib.h
index 30d24aea1c10..754e8f5f5fd4 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -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++" {