svn commit: r355776 - in head: include sys/compat/linuxkpi/common/include/linux sys/sys

[Conrad Meyer]

Author: cem
Date: Sun Dec 15 17:33:26 2019
New Revision: 355776
URL: https://svnweb.freebsd.org/changeset/base/355776

Log:
  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

Modified:
  head/include/stdlib.h
  head/sys/compat/linuxkpi/common/include/linux/compiler.h
  head/sys/sys/cdefs.h

Modified: head/include/stdlib.h
==============================================================================
--- head/include/stdlib.h	Sun Dec 15 16:28:12 2019	(r355775)
+++ head/include/stdlib.h	Sun Dec 15 17:33:26 2019	(r355776)
@@ -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

Modified: head/sys/compat/linuxkpi/common/include/linux/compiler.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/compiler.h	Sun Dec 15 16:28:12 2019	(r355775)
+++ head/sys/compat/linuxkpi/common/include/linux/compiler.h	Sun Dec 15 17:33:26 2019	(r355776)
@@ -50,6 +50,7 @@
 #define __cond_lock(x,c)		(c)
 #define	__bitwise
 #define __devinitdata
+#define	__deprecated
 #define __init
 #define	__initconst
 #define	__devinit

Modified: head/sys/sys/cdefs.h
==============================================================================
--- head/sys/sys/cdefs.h	Sun Dec 15 16:28:12 2019	(r355775)
+++ head/sys/sys/cdefs.h	Sun Dec 15 17:33:26 2019	(r355776)
@@ -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.