===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/job.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -c -r1.120 -r1.121
*** src/usr.bin/make/job.c	2010/07/19 19:46:44	1.120
--- src/usr.bin/make/job.c	2012/03/22 13:47:12	1.121
***************
*** 1,4 ****
! /*	$OpenBSD: job.c,v 1.120 2010/07/19 19:46:44 espie Exp $	*/
  /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: job.c,v 1.121 2012/03/22 13:47:12 espie Exp $	*/
  /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
  
  /*
***************
*** 265,273 ****
  			type = "Should not happen";
  			break;
  		}
! 	if (p->n->lineno)
  		Error(" %s %d (%s, line %lu of %s)",
! 		    type, p->code, p->n->name, p->n->lineno, p->n->fname);
  	else
  		Error(" %s %d (%s)", type, p->code, p->n->name);
  	}
--- 265,273 ----
  			type = "Should not happen";
  			break;
  		}
! 	if (p->n->origin.lineno)
  		Error(" %s %d (%s, line %lu of %s)",
! 		    type, p->code, p->n->name, p->n->origin.lineno, p->n->origin.fname);
  	else
  		Error(" %s %d (%s)", type, p->code, p->n->name);
  	}