From 482f0c0255e76c75011d71ee2f9f07c500c22a5e Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Sun, 15 Dec 2019 17:33:26 +0000
Subject: [PATCH] Revert r355760, r355759

And remove the inline/deprecated attribute use entirely in stdlib.h, from
r355747.  The intent was to provide a buildable API transitionary period, but
clearly that was counter-productive.

Reported by:	delphij, imp, others
---
 include/stdlib.h                                    | 6 ------
 sys/compat/linuxkpi/common/include/linux/compiler.h | 1 +
 sys/sys/cdefs.h                                     | 8 --------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/include/stdlib.h b/include/stdlib.h
index e46e473fabc4..f9388037410c 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -314,12 +314,6 @@ long long
 	strtonum(const char *, long long, long long, const char **);
 
 /* Deprecated interfaces, to be removed. */
-static inline void
-__deprecated("sranddev to be removed in FreeBSD 13")
-sranddev(void)
-{
-}
-
 __int64_t
 	 strtoq(const char *, char **, int);
 __uint64_t
diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h
index 58611a4f4728..b1fa12754f7d 100644
--- a/sys/compat/linuxkpi/common/include/linux/compiler.h
+++ b/sys/compat/linuxkpi/common/include/linux/compiler.h
@@ -50,6 +50,7 @@
 #define __cond_lock(x,c)		(c)
 #define	__bitwise
 #define __devinitdata
+#define	__deprecated
 #define __init
 #define	__initconst
 #define	__devinit
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index de09e1969331..42734b788b30 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -468,14 +468,6 @@
 #define	__hidden
 #endif
 
-#if __GNUC_PREREQ__(4, 5) || defined(__clang__)
-#define	__deprecated(m)	__attribute__((__deprecated__(m)))
-#elif defined(__GNUC__)
-#define	__deprecated(m)	__attribute__((__deprecated__))
-#else
-#define	__deprecated(m)
-#endif
-
 /*
  * We define this here since <stddef.h>, <sys/queue.h>, and <sys/types.h>
  * require it.