===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/cond.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/make/cond.c	2007/09/16 12:30:35	1.36
--- src/usr.bin/make/cond.c	2007/09/17 08:36:57	1.37
***************
*** 1,5 ****
  /*	$OpenPackages$ */
! /*	$OpenBSD: cond.c,v 1.36 2007/09/16 12:30:35 espie Exp $	*/
  /*	$NetBSD: cond.c,v 1.7 1996/11/06 17:59:02 christos Exp $	*/
  
  /*
--- 1,5 ----
  /*	$OpenPackages$ */
! /*	$OpenBSD: cond.c,v 1.37 2007/09/17 08:36:57 espie Exp $	*/
  /*	$NetBSD: cond.c,v 1.7 1996/11/06 17:59:02 christos Exp $	*/
  
  /*
***************
*** 996,1002 ****
  	 * so we return COND_PARSE, unless this endif isn't paired with
  	 * a decent if.  */
  	    if (skipIfLevel != 0) {
! 		skipIfLevel -= 1;
  		return COND_SKIP;
  	    } else {
  		if (condTop == MAXIF) {
--- 996,1002 ----
  	 * so we return COND_PARSE, unless this endif isn't paired with
  	 * a decent if.  */
  	    if (skipIfLevel != 0) {
! 		skipIfLevel--;
  		return COND_SKIP;
  	    } else {
  		if (condTop == MAXIF) {
***************
*** 1004,1010 ****
  		    return COND_INVALID;
  		} else {
  		    skipLine = false;
! 		    condTop += 1;
  		    return COND_PARSE;
  		}
  	    }
--- 1004,1010 ----
  		    return COND_INVALID;
  		} else {
  		    skipLine = false;
! 		    condTop++;
  		    return COND_PARSE;
  		}
  	    }
***************
*** 1055,1061 ****
      } else if (skipLine) {
  	/* Don't even try to evaluate a conditional that's not an else if
  	 * we're skipping things...  */
! 	skipIfLevel += 1;
  	return COND_SKIP;
      }
  
--- 1055,1061 ----
      } else if (skipLine) {
  	/* Don't even try to evaluate a conditional that's not an else if
  	 * we're skipping things...  */
! 	skipIfLevel++;
  	return COND_SKIP;
      }
  
***************
*** 1096,1102 ****
      }
      
      if (!ifp->isElse)
! 	condTop -= 1;
      else if (skipIfLevel != 0 || condStack[condTop].value) {
  	/* If this is an else-type conditional, it should only take effect
  	 * if its corresponding if was evaluated and false. If its if was
--- 1096,1102 ----
      }
      
      if (!ifp->isElse)
! 	condTop--;
      else if (skipIfLevel != 0 || condStack[condTop].value) {
  	/* If this is an else-type conditional, it should only take effect
  	 * if its corresponding if was evaluated and false. If its if was