about summary refs log tree commit diff
path: root/misc
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-02-06 21:48:35 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-02-06 21:48:35 +0000
commit383e87c96b9eee3b4b2d78dbeeaa8e2c0db35feb (patch)
tree3326eeeb36f36f21acac944220678b1286253656 /misc
parentd92c2759976600decd8353730a5b5ce30c2758d8 (diff)
downloadglibc-383e87c96b9eee3b4b2d78dbeeaa8e2c0db35feb.tar.gz
glibc-383e87c96b9eee3b4b2d78dbeeaa8e2c0db35feb.tar.xz
glibc-383e87c96b9eee3b4b2d78dbeeaa8e2c0db35feb.zip
Fix non-__GNUC__ definitions of __inline and __restrict (bug 17721).
Bug 17721 reports that the non-__GNUC__ definitions of __inline and
__restrict are suboptimal, in that they are defined to empty when they
could be defined to inline and restrict for appropriate language
versions.  This patch makes those fixes.

Tested for x86_64 (however, I have not done any testing with an actual
non-__GNUC__ compiler and it's likely such compilers may have other
problems with glibc headers).

	[BZ #17721]
	* misc/sys/cdefs.h [!__GNUC__ && (__cplusplus || (__STDC_VERSION__
	&& __STDC_VERSION__ >= 199901L))] (__inline): Define to inline.
	[!__GNUC_PREREQ (2,92) && __STDC_VERSION__ && __STDC_VERSION__ >=
	199901L] (__restrict): Define to restrict.
Diffstat (limited to 'misc')
-rw-r--r--misc/sys/cdefs.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index af103fdb8a..e80a45ca68 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -72,7 +72,12 @@
 
 #else	/* Not GCC.  */
 
-# define __inline		/* No inline functions.  */
+# if (defined __cplusplus						\
+      || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+#  define __inline	inline
+# else
+#  define __inline		/* No inline functions.  */
+# endif
 
 # define __THROW
 # define __THROWNL
@@ -368,7 +373,11 @@
 
 /* __restrict is known in EGCS 1.2 and above. */
 #if !__GNUC_PREREQ (2,92)
-# define __restrict	/* Ignore */
+# if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#  define __restrict	restrict
+# else
+#  define __restrict	/* Ignore */
+# endif
 #endif
 
 /* ISO C99 also allows to declare arrays as non-overlapping.  The syntax is