aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2023-08-06 13:27:27 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2023-08-13 04:35:41 +0000
commit4e94219d55824b19693287052edd8a1da76e3541 (patch)
treeea10fe44be033d98c40dbf3c406fd266d7707002
parent79757c0a33ca0da0f079c7250b820c81520649d9 (diff)
downloadsrc-4e94219d55824b19693287052edd8a1da76e3541.tar.gz
src-4e94219d55824b19693287052edd8a1da76e3541.zip
sys/cdefs.h: fix for use __restrict in C++
PR: 272723 (cherry picked from commit 15876d9fd83fdfa7d541ea747eb40faeade975d2)
-rw-r--r--sys/sys/cdefs.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 28e464122e58..3fde24f0b9e9 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -404,17 +404,15 @@
#endif
/*
- * GCC 2.95 provides `__restrict' as an extension to C90 to support the
- * C99-specific `restrict' type qualifier. We happen to use `__restrict' as
- * a way to define the `restrict' type qualifier without disturbing older
- * software that is unaware of C99 keywords.
+ * We use `__restrict' as a way to define the `restrict' type qualifier
+ * without disturbing older software that is unaware of C99 keywords.
+ * GCC also provides `__restrict' as an extension to support C99-style
+ * restricted pointers in other language modes.
*/
-#if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901
-#define __restrict
-#else
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901
#define __restrict restrict
-#endif
+#elif !__GNUC_PREREQ__(2, 95)
+#define __restrict
#endif
/*