===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/make.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/make/make.h	2000/06/23 16:20:01	1.22
--- src/usr.bin/make/make.h	2000/06/23 16:23:26	1.23
***************
*** 1,4 ****
! /*	$OpenBSD: make.h,v 1.22 2000/06/23 16:20:01 espie Exp $	*/
  /*	$NetBSD: make.h,v 1.15 1997/03/10 21:20:00 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: make.h,v 1.23 2000/06/23 16:23:26 espie Exp $	*/
  /*	$NetBSD: make.h,v 1.15 1997/03/10 21:20:00 christos Exp $	*/
  
  /*
***************
*** 94,99 ****
--- 94,110 ----
  #define PREFIX_INDEX	4
  #define ARCHIVE_INDEX   5
  #define MEMBER_INDEX    6
+ 
+ #define LOCAL_SIZE	7
+ 
+ /* SymTable is private to var.c, but is declared here to allow for
+    local declaration of context tables
+  */
+ typedef struct {
+ 	struct Var_ *locals[LOCAL_SIZE];
+ } SymTable;
+ 
+ typedef LIST GSymT;
  /*-
   * The structure for an individual graph node. Each node has several
   * pieces of data associated with it.
***************
*** 122,129 ****
   *	17) a Lst of strings that are commands to be given to a shell
   *	   to create this target.
   */
- typedef LIST SymTable;
- 
  typedef struct GNode {
      char            *name;     	/* The target's name */
      char    	    *path;     	/* The full pathname of the file */
--- 133,138 ----
***************
*** 345,353 ****
  
  extern GNode    *DEFAULT;    	/* .DEFAULT rule */
  
! extern SymTable *VAR_GLOBAL;   	/* Variables defined in a global context, e.g
  				 * in the Makefile itself */
! extern SymTable *VAR_CMD;    	/* Variables defined on the command line */
  extern char    	var_Error[];   	/* Value returned by Var_Parse when an error
  				 * is encountered. It actually points to
  				 * an empty string, so naive callers needn't
--- 354,362 ----
  
  extern GNode    *DEFAULT;    	/* .DEFAULT rule */
  
! extern GSymT	*VAR_GLOBAL;   	/* Variables defined in a global context, e.g
  				 * in the Makefile itself */
! extern GSymT	*VAR_CMD;    	/* Variables defined on the command line */
  extern char    	var_Error[];   	/* Value returned by Var_Parse when an error
  				 * is encountered. It actually points to
  				 * an empty string, so naive callers needn't