summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authordsl <dsl@NetBSD.org>2008-11-22 23:42:16 +0000
committerdsl <dsl@NetBSD.org>2008-11-22 23:42:16 +0000
commit83146d79d663d53f1eb88dbb2ce7bc82dde0ceff (patch)
tree21fcdb32486a49a680be2ed2a1771a85396dd6bd /usr.bin/make
parent3b1d48844e33e91c94421b64199cd74ae2c26809 (diff)
Fix conversion of hex numerics in comparisons.
Broken by a fix from christos 14 years ago.
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/cond.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index bdff53908be..1b0e728c09a 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.44 2008/11/22 18:47:47 dsl Exp $ */
+/* $NetBSD: cond.c,v 1.45 2008/11/22 23:42:16 dsl Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.44 2008/11/22 18:47:47 dsl Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.45 2008/11/22 23:42:16 dsl Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.44 2008/11/22 18:47:47 dsl Exp $");
+__RCSID("$NetBSD: cond.c,v 1.45 2008/11/22 23:42:16 dsl Exp $");
#endif
#endif /* not lint */
#endif
@@ -515,7 +515,7 @@ CondCvtArg(char *str, double *value)
if (isdigit((unsigned char) *str))
x = *str - '0';
else if (isxdigit((unsigned char) *str))
- x = 10 + *str - isupper((unsigned char) *str) ? 'A' : 'a';
+ x = 10 + *str - (isupper((unsigned char) *str) ? 'A' : 'a');
else
break;
i = (i << 4) + x;