diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-11-04 09:31:58 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-11-04 09:31:58 +0000 |
| commit | e45e73d49870eec3056ba9ec0b63b14890415ba6 (patch) | |
| tree | 9193f7d5c64d7245bdfef464828e160e3ac0ddb8 /usr.bin/make | |
| parent | ffc3f3ef0af37627b44367017730b0f07023e6d6 (diff) | |
prevent gcc from complaining
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/var.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 303b152f377..b161b41cae4 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: var.c,v 1.81 2007/11/03 15:42:10 deraadt Exp $ */ +/* $OpenBSD: var.c,v 1.82 2007/11/04 09:31:57 espie Exp $ */ /* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */ /* @@ -560,10 +560,10 @@ find_global_var(const char *name, const char *ename, uint32_t k) v = find_global_var_without_env(name, ename, k); - if ((v->flags & VAR_SEEN_ENV) == 0 && - (checkEnvFirst && (v->flags & VAR_FROM_CMD) == 0 || - (v->flags & VAR_DUMMY) != 0)) - fill_from_env(v); + if ((v->flags & VAR_SEEN_ENV) == 0) + if ((checkEnvFirst && (v->flags & VAR_FROM_CMD) == 0) || + (v->flags & VAR_DUMMY) != 0) + fill_from_env(v); return v; } |