===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/compat.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -c -r1.49 -r1.50
*** src/usr.bin/make/compat.c	2003/06/03 02:56:11	1.49
--- src/usr.bin/make/compat.c	2004/04/07 13:11:35	1.50
***************
*** 1,5 ****
  /*	$OpenPackages$ */
! /*	$OpenBSD: compat.c,v 1.49 2003/06/03 02:56:11 millert Exp $	*/
  /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
--- 1,5 ----
  /*	$OpenPackages$ */
! /*	$OpenBSD: compat.c,v 1.50 2004/04/07 13:11:35 espie Exp $	*/
  /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
***************
*** 82,89 ****
  static volatile sig_atomic_t interrupted;
  
  static void 
! CompatInterrupt(signo)
!     int signo;
  {
      if (interrupted != SIGINT)
  	interrupted = signo;
--- 82,88 ----
  static volatile sig_atomic_t interrupted;
  
  static void 
! CompatInterrupt(int signo)
  {
      if (interrupted != SIGINT)
  	interrupted = signo;
***************
*** 104,111 ****
   *-----------------------------------------------------------------------
   */
  static int
! shellneed(av)
! 	char **av;
  {
  	char *runsh[] = {
  		"alias", "cd", "eval", "exec", "exit", "read", "set", "ulimit",
--- 103,109 ----
   *-----------------------------------------------------------------------
   */
  static int
! shellneed(char **av)
  {
  	char *runsh[] = {
  		"alias", "cd", "eval", "exec", "exit", "read", "set", "ulimit",
***************
*** 156,164 ****
   *-----------------------------------------------------------------------
   */
  static int
! CompatRunCommand(cmdp, gnp)
!     void *	  cmdp; 	/* Command to execute */
!     void *	  gnp;		/* Node from which the command came */
  {
      char	  *cmdStart;	/* Start of expanded command */
      char *cp, *bp = NULL;
--- 154,161 ----
   *-----------------------------------------------------------------------
   */
  static int
! CompatRunCommand(void *cmdp,	/* Command to execute */
!     void *gnp)			/* Node from which the command came */
  {
      char	  *cmdStart;	/* Start of expanded command */
      char *cp, *bp = NULL;
***************
*** 375,383 ****
   *-----------------------------------------------------------------------
   */
  static void
! CompatMake(gnp, pgnp)
!     void *	gnp;	    /* The node to make */
!     void *	pgnp;	    /* Parent to abort if necessary */
  {
      GNode *gn = (GNode *)gnp;
      GNode *pgn = (GNode *)pgnp;
--- 372,379 ----
   *-----------------------------------------------------------------------
   */
  static void
! CompatMake(void *gnp,	/* The node to make */
!     void *pgnp)		/* Parent to abort if necessary */
  {
      GNode *gn = (GNode *)gnp;
      GNode *pgn = (GNode *)pgnp;
***************
*** 557,568 ****
  }
  
  void
! Compat_Run(targs)
!     Lst 	  targs;    /* List of target nodes to re-create */
  {
!     char	  *cp;	    /* Pointer to string of shell meta-characters */
!     GNode	  *gn = NULL;/* Current root target */
!     int 	  errors;   /* Number of targets not remade due to errors */
  
      signal(SIGINT, CompatInterrupt);
      signal(SIGTERM, CompatInterrupt);
--- 553,563 ----
  }
  
  void
! Compat_Run(Lst targs)		/* List of target nodes to re-create */
  {
!     char	  *cp;		/* Pointer to string of shell meta-characters */
!     GNode	  *gn = NULL;	/* Current root target */
!     int 	  errors;   	/* Number of targets not remade due to errors */
  
      signal(SIGINT, CompatInterrupt);
      signal(SIGTERM, CompatInterrupt);