Mercurial > illumos > illumos-gate

changeset 13746:ad469755a3d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>
author Richard Lowe <richlowe@richlowe.net>
date Thu, 28 Jun 2012 07:28:22 +0100
parents 6b3106b4250f
children 66edd2f65616
files usr/src/uts/common/sys/feature_tests.h
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/sys/feature_tests.h	Fri Dec 09 04:10:51 2011 +0000
+++ b/usr/src/uts/common/sys/feature_tests.h	Thu Jun 28 07:28:22 2012 +0100
@@ -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 @@
  * 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