summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorRichard Lowe <richlowe@richlowe.net>2012-06-28 07:28:22 +0100
committerRichard Lowe <richlowe@richlowe.net>2012-06-28 07:28:22 +0100
commitdbae7a133d3b7871ad06b232d6707cbbca2493fb (patch)
treeb052a45f8a8510c2078b36364aaa5926b88b3035 /usr/src
parent53ffad05253d09b09c7bd6d11bbd687506ff0312 (diff)
downloadillumos-joyent-dbae7a133d3b7871ad06b232d6707cbbca2493fb.tar.gz
2941 need to protect __RESTRICT_KYWD from foolish compilers
Reviewed by: Adam Leventhal <ahl@delphix.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by: Jason King <jason.brian.king@gmail.com> Reviewed by: Richard Elling <richard.elling@richardelling.com> Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/sys/feature_tests.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/uts/common/sys/feature_tests.h b/usr/src/uts/common/sys/feature_tests.h
index 43339a83cd..e6ababd3d4 100644
--- a/usr/src/uts/common/sys/feature_tests.h
+++ b/usr/src/uts/common/sys/feature_tests.h
@@ -27,8 +27,6 @@
#ifndef _SYS_FEATURE_TESTS_H
#define _SYS_FEATURE_TESTS_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/ccompile.h>
#include <sys/isa_defs.h>
@@ -365,7 +363,7 @@ extern "C" {
* compiler is used. This allows for the use of single prototype
* declarations regardless of compiler version.
*/
-#if (defined(__STDC__) && defined(_STDC_C99))
+#if (defined(__STDC__) && defined(_STDC_C99)) && !defined(__cplusplus)
#define _RESTRICT_KYWD restrict
#else
#define _RESTRICT_KYWD