Index: share/mk/bsd.sys.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.sys.mk,v
retrieving revision 1.47
diff -u -r1.47 bsd.sys.mk
--- share/mk/bsd.sys.mk	23 Jul 2008 06:14:21 -0000	1.47
+++ share/mk/bsd.sys.mk	22 Jan 2009 17:22:59 -0000
@@ -8,8 +8,10 @@
 
 # for GCC:  http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
 
+# the default is gnu99 for now
+CSTD		?= gnu99
+
 .if !defined(NO_WARNS) && ${CC} != "icc"
-. if defined(CSTD)
 .  if ${CSTD} == "k&r"
 CFLAGS		+= -traditional
 .  elif ${CSTD} == "c89" || ${CSTD} == "c90"
@@ -23,7 +25,6 @@
 .  endif
 # -pedantic is problematic because it also imposes namespace restrictions
 #CFLAGS		+= -pedantic
-. endif
 . if defined(WARNS)
 .  if ${WARNS} >= 1
 CWARNFLAGS	+=	-Wsystem-headers
Index: cddl/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/cddl/Makefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Makefile.inc
--- cddl/Makefile.inc	5 Nov 2008 19:35:09 -0000	1.5
+++ cddl/Makefile.inc	22 Jan 2009 17:22:59 -0000
@@ -6,3 +6,5 @@
 IGNORE_PRAGMA=	YES
 
 CFLAGS+=	-DNEED_SOLARIS_BOOLEAN
+
+CSTD?=		gnu89
Index: cddl/lib/libzpool/Makefile
===================================================================
RCS file: /home/ncvs/src/cddl/lib/libzpool/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- cddl/lib/libzpool/Makefile	17 Nov 2008 20:49:29 -0000	1.7
+++ cddl/lib/libzpool/Makefile	22 Jan 2009 17:23:00 -0000
@@ -33,8 +33,6 @@
 		${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \
 		${UNICODE_SRCS}
 
-CFLAGS+=	-std=c99
-
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
@@ -60,4 +58,7 @@
 # atomic.S doesn't like profiling.
 NO_PROFILE=
 
+CSTD=	c99
+
 .include <bsd.lib.mk>
+
Index: cddl/usr.bin/ztest/Makefile
===================================================================
RCS file: /home/ncvs/src/cddl/usr.bin/ztest/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- cddl/usr.bin/ztest/Makefile	17 Nov 2008 20:49:29 -0000	1.6
+++ cddl/usr.bin/ztest/Makefile	22 Jan 2009 17:23:00 -0000
@@ -5,8 +5,6 @@
 PROG=	ztest
 NO_MAN=
 
-CFLAGS+= -std=c99
-
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
@@ -21,4 +19,6 @@
 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
 LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
+CSTD=	c99
+
 .include <bsd.prog.mk>
Index: cddl/usr.sbin/zdb/Makefile
===================================================================
RCS file: /home/ncvs/src/cddl/usr.sbin/zdb/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- cddl/usr.sbin/zdb/Makefile	17 Nov 2008 20:49:29 -0000	1.6
+++ cddl/usr.sbin/zdb/Makefile	22 Jan 2009 17:23:00 -0000
@@ -6,8 +6,6 @@
 MAN=	zdb.8
 SRCS=	zdb.c zdb_il.c
 
-CFLAGS+= -std=c99
-
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
@@ -25,4 +23,6 @@
 	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
 LDADD=	-lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
 
+CSTD=	c99
+
 .include <bsd.prog.mk>
Index: tools/regression/include/tgmath/Makefile
===================================================================
RCS file: /home/ncvs/src/tools/regression/include/tgmath/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- tools/regression/include/tgmath/Makefile	21 Dec 2004 08:47:21 -0000	1.3
+++ tools/regression/include/tgmath/Makefile	22 Jan 2009 17:23:00 -0000
@@ -1,7 +1,8 @@
 # $FreeBSD: src/tools/regression/include/tgmath/Makefile,v 1.3 2004/12/21 08:47:21 ru Exp $
 
 PROG=	tgmath
-CFLAGS+= -fno-builtin -std=c99
+CSTD=	c99
+CFLAGS+= -fno-builtin
 NO_MAN=
 
 .include <bsd.prog.mk>