[src/trunk]: src/usr.bin/make make(1): fix type mismatch between int and Token

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/49ca42571c3a
branches:  trunk
changeset: 1016141:49ca42571c3a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 08 23:05:47 2020 +0000

description:
make(1): fix type mismatch between int and Token

diffstat:

 usr.bin/make/cond.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 7f7db50242a5 -r 49ca42571c3a usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Sun Nov 08 23:00:09 2020 +0000
+++ b/usr.bin/make/cond.c       Sun Nov 08 23:05:47 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.192 2020/11/08 22:44:05 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.193 2020/11/08 23:05:47 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -93,7 +93,7 @@
 #include "dir.h"
 
 /*     "@(#)cond.c     8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: cond.c,v 1.192 2020/11/08 22:44:05 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.193 2020/11/08 23:05:47 rillig Exp $");
 
 /*
  * The parsing of conditional expressions is based on this grammar:
@@ -757,7 +757,7 @@
            return arglen == 0 ? TOK_FALSE : TOK_ERROR;
        }
        /* Evaluate the argument using the required function. */
-       t = !doEval || fn_def->fn_eval(arglen, arg);
+       t = ToToken(!doEval || fn_def->fn_eval(arglen, arg));
        free(arg);
        par->p = cp;
        return t;
@@ -789,7 +789,7 @@
      * after .if must have been taken literally, so the argument cannot
      * be empty - even if it contained a variable expansion.
      */
-    t = !doEval || If_Eval(par->if_info, arg, arglen);
+    t = ToToken(!doEval || If_Eval(par->if_info, arg, arglen));
     free(arg);
     return t;
 }