From 07f2e845ae1ef66becffd2504c58a16e11ad79d1 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sun, 1 Jun 2003 18:31:25 +0000
Subject: Compile our code as C99 by default.

---
 share/mk/bsd.sys.mk | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'share/mk/bsd.sys.mk')

diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 6d40e80..760155b 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -8,20 +8,20 @@
 
 # for GCC:  http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
 
-.if !defined(NO_WARNS)
-. if defined(CSTD)
-.  if ${CSTD} == "k&r"
+CSTD		?=	c99
+.if ${CSTD} == "k&r"
 CFLAGS		+=	-traditional
-.  elif ${CSTD} == "c89" || ${CSTD} == "c90"
+.elif ${CSTD} == "c89" || ${CSTD} == "c90"
 CFLAGS		+=	-std=iso9899:1990
-.  elif ${CSTD} == "c94" || ${CSTD} == "c95"
+.elif ${CSTD} == "c94" || ${CSTD} == "c95"
 CFLAGS		+=	-std=iso9899:199409
-.  elif ${CSTD} == "c99"
+.elif ${CSTD} == "c99"
 CFLAGS		+=	-std=iso9899:1999
-.  else
+.else
 CFLAGS		+=	-std=${CSTD}
-.  endif
-. endif
+.endif
+
+.if !defined(NO_WARNS)
 . if defined(WARNS)
 .  if ${WARNS} > 0
 CFLAGS		+=	-Wsystem-headers
@@ -38,6 +38,8 @@ CFLAGS		+=	-W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
 .  if ${WARNS} > 3
 CFLAGS		+=	-Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align
 .  endif
+#	XXX: the warning that was here became problematic.
+#.  if ${WARNS} > 4
 # BDECFLAGS
 .  if ${WARNS} > 5
 .   if defined(CSTD)
-- 
cgit v1.1