===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/gnode.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/make/gnode.h	2010/07/19 19:46:44	1.17
--- src/usr.bin/make/gnode.h	2012/03/22 13:47:12	1.18
***************
*** 1,6 ****
  #ifndef GNODE_H
  #define GNODE_H
! /*	$OpenBSD: gnode.h,v 1.17 2010/07/19 19:46:44 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
--- 1,6 ----
  #ifndef GNODE_H
  #define GNODE_H
! /*	$OpenBSD: gnode.h,v 1.18 2012/03/22 13:47:12 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
***************
*** 33,38 ****
--- 33,41 ----
  #ifndef LIST_TYPE
  #include "lst_t.h"
  #endif
+ #ifndef LOCATION_TYPE
+ #include "location.h"
+ #endif
  #ifndef SYMTABLE_H
  #include "symtable.h"
  #endif
***************
*** 127,134 ****
      LIST preds;		/* Nodes that must be made before this one */
  
      SymTable context;	/* The local variables */
!     unsigned long lineno;/* First line number of commands.  */
!     const char *fname;	/* File name of commands.  */
      LIST commands;	/* Creation commands */
      LIST expanded;	/* Expanded commands */
      struct Suff_ *suffix;/* Suffix for the node (determined by
--- 130,136 ----
      LIST preds;		/* Nodes that must be made before this one */
  
      SymTable context;	/* The local variables */
!     Location origin;	/* First line number and file name of commands. */
      LIST commands;	/* Creation commands */
      LIST expanded;	/* Expanded commands */
      struct Suff_ *suffix;/* Suffix for the node (determined by