Module Name: src
Committed By: jdc
Date: Sun Jun 24 15:44:07 UTC 2012
Modified Files:
src/sys/sys [netbsd-6]: cdefs.h
Log Message:
Pull up revisions:
src/sys/sys/cdefs.h revisions 1.96,1.97
(requested by joerg in ticket #369).
To generate a diff of this commit:
cvs rdiff -u -r1.89.6.1 -r1.89.6.2 src/sys/sys/cdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/cdefs.h
diff -u src/sys/sys/cdefs.h:1.89.6.1 src/sys/sys/cdefs.h:1.89.6.2
--- src/sys/sys/cdefs.h:1.89.6.1 Wed Feb 22 18:40:05 2012
+++ src/sys/sys/cdefs.h Sun Jun 24 15:44:07 2012
@@ -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
