aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorHartmut Brandt <harti@FreeBSD.org>2005-05-12 15:41:02 +0000
committerHartmut Brandt <harti@FreeBSD.org>2005-05-12 15:41:02 +0000
commit6bf2b616ac320f4915394e83d59bcf7553b3d14f (patch)
tree16d771a2b30d090e8aa793a787e5d9789ac15bb1 /usr.bin
parent375209dd24594d42e7e803419c304441dc8186e2 (diff)
Notes
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/Makefile2
-rw-r--r--usr.bin/make/cond.c13
2 files changed, 8 insertions, 7 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 40903eb34b02b..bbb03de3c9940 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -8,7 +8,7 @@ SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
lst.c main.c make.c parse.c str.c suff.c targ.c util.c var.c
NO_WERROR=
-WARNS?= 3
+WARNS?= 4
NO_SHARED?= YES
CFLAGS+=-DMAKE_VERSION=\"5200408120\"
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 81065231d13e7..a9209b10ca890 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -476,11 +476,12 @@ CondToken(Boolean doEval)
t = EndOfFile;
break;
case '$': {
- char *lhs;
- char *rhs;
- const char *op;
- size_t varSpecLen = 0;
- Boolean doFree;
+ char *lhs;
+ const char *op;
+ char *rhs;
+ char zero[] = "0";
+ size_t varSpecLen = 0;
+ Boolean doFree;
/*
* Parse the variable spec and skip over it, saving its
@@ -557,7 +558,7 @@ CondToken(Boolean doEval)
default:
op = "!=";
- rhs = "0";
+ rhs = zero;
break;
}
if (*rhs == '"') {