[src/netbsd-6]: src/sys/sys Pull up revisions:

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce82756b00e0
branches:  netbsd-6
changeset: 774242:ce82756b00e0
user:      jdc <jdc%NetBSD.org@localhost>
date:      Sun Jun 24 15:44:07 2012 +0000

description:
Pull up revisions:
  src/sys/sys/cdefs.h revisions 1.96,1.97
(requested by joerg in ticket #369).

diffstat:

 sys/sys/cdefs.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 86d92a5adb7c -r ce82756b00e0 sys/sys/cdefs.h
--- a/sys/sys/cdefs.h   Sun Jun 24 02:50:19 2012 +0000
+++ b/sys/sys/cdefs.h   Sun Jun 24 15:44:07 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cdefs.h,v 1.89.6.1 2012/02/22 18:40:05 riz Exp $       */
+/*     $NetBSD: cdefs.h,v 1.89.6.2 2012/06/24 15:44:07 jdc Exp $       */
 
 /*
  * Copyright (c) 1991, 1993
@@ -149,7 +149,7 @@
 #define        __CTASSERT(x)           __CTASSERT0(x, __ctassert, __LINE__)
 #endif
 #define        __CTASSERT0(x, y, z)    __CTASSERT1(x, y, z)
-#define        __CTASSERT1(x, y, z)    typedef char y ## z[(x) ? 1 : -1];
+#define        __CTASSERT1(x, y, z)    typedef char y ## z[/*CONSTCOND*/(x) ? 1 : -1]
 
 /*
  * The following macro is used to remove const cast-away warnings