===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/compat.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/make/compat.c	2000/06/10 01:26:36	1.25
--- src/usr.bin/make/compat.c	2000/06/10 01:32:22	1.26
***************
*** 1,4 ****
! /*	$OpenBSD: compat.c,v 1.25 2000/06/10 01:26:36 espie Exp $	*/
  /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: compat.c,v 1.26 2000/06/10 01:32:22 espie Exp $	*/
  /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: compat.c,v 1.25 2000/06/10 01:26:36 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: compat.c,v 1.26 2000/06/10 01:32:22 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 85,91 ****
  static GNode	    *ENDNode;
  static void CompatInterrupt __P((int));
  static int CompatRunCommand __P((ClientData, ClientData));
! static int CompatMake __P((ClientData, ClientData));
  static int shellneed __P((char **av));
  
  /*-
--- 85,91 ----
  static GNode	    *ENDNode;
  static void CompatInterrupt __P((int));
  static int CompatRunCommand __P((ClientData, ClientData));
! static void CompatMake __P((ClientData, ClientData));
  static int shellneed __P((char **av));
  
  /*-
***************
*** 423,438 ****
   * CompatMake --
   *	Make a target.
   *
-  * Results:
-  *	0
-  *
   * Side Effects:
   *	If an error is detected and not being ignored, the process exits.
   *
   *-----------------------------------------------------------------------
   */
! static int
! CompatMake (gnp, pgnp)
      ClientData	gnp;	    /* The node to make */
      ClientData  pgnp;	    /* Parent to abort if necessary */
  {
--- 423,435 ----
   * CompatMake --
   *	Make a target.
   *
   * Side Effects:
   *	If an error is detected and not being ignored, the process exits.
   *
   *-----------------------------------------------------------------------
   */
! static void
! CompatMake(gnp, pgnp)
      ClientData	gnp;	    /* The node to make */
      ClientData  pgnp;	    /* Parent to abort if necessary */
  {
***************
*** 462,468 ****
  	if (!gn->make) {
  	    gn->made = ABORTED;
  	    pgn->make = FALSE;
! 	    return (0);
  	}
  
  	if (Lst_Member (gn->iParents, pgn) != NULL) {
--- 459,465 ----
  	if (!gn->make) {
  	    gn->made = ABORTED;
  	    pgn->make = FALSE;
! 	    return;
  	}
  
  	if (Lst_Member (gn->iParents, pgn) != NULL) {
***************
*** 483,489 ****
  	    if (DEBUG(MAKE)) {
  		printf("up-to-date.\n");
  	    }
! 	    return (0);
  	} else if (DEBUG(MAKE)) {
  	    printf("out-of-date.\n");
  	}
--- 480,486 ----
  	    if (DEBUG(MAKE)) {
  		printf("up-to-date.\n");
  	    }
! 	    return;
  	} else if (DEBUG(MAKE)) {
  	    printf("out-of-date.\n");
  	}
***************
*** 642,649 ****
  		break;
  	}
      }
- 
-     return (0);
  }
  
  /*-
--- 639,644 ----
***************
*** 716,722 ****
       */
      errors = 0;
      while ((gn = (GNode *)Lst_DeQueue(targs)) != NULL) {
! 	CompatMake (gn, gn);
  
  	if (gn->made == UPTODATE) {
  	    printf ("`%s' is up to date.\n", gn->name);
--- 711,717 ----
       */
      errors = 0;
      while ((gn = (GNode *)Lst_DeQueue(targs)) != NULL) {
! 	CompatMake(gn, gn);
  
  	if (gn->made == UPTODATE) {
  	    printf ("`%s' is up to date.\n", gn->name);