===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/var.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/make/var.h	2016/10/23 14:54:14	1.19
--- src/usr.bin/make/var.h	2019/12/21 15:31:54	1.20
***************
*** 1,6 ****
  #ifndef VAR_H
  #define VAR_H
! /* $OpenBSD: var.h,v 1.19 2016/10/23 14:54:14 espie Exp $ */
  /*
   * Copyright (c) 2001 Marc Espie.
   *
--- 1,6 ----
  #ifndef VAR_H
  #define VAR_H
! /* $OpenBSD: var.h,v 1.20 2019/12/21 15:31:54 espie Exp $ */
  /*
   * Copyright (c) 2001 Marc Espie.
   *
***************
*** 48,55 ****
  #define Var_Set(n, v)	Var_Seti_with_ctxt(n, NULL, v, VAR_GLOBAL)
  #define Var_Seti(n, e, v) Var_Seti_with_ctxt(n, e, v, VAR_GLOBAL)
  /* Var_Appendi_with_ctxt(name, end, val, cxt);
!  *	Appends value val to variable name/end in context ctxt, defining it
!  *	if it does not already exist, and inserting one space otherwise. */
  extern void Var_Appendi_with_ctxt(const char *, const char *,
  	const char *, int);
  #define Var_Append(n, v)	Var_Appendi_with_ctxt(n, NULL, v, VAR_GLOBAL)
--- 48,56 ----
  #define Var_Set(n, v)	Var_Seti_with_ctxt(n, NULL, v, VAR_GLOBAL)
  #define Var_Seti(n, e, v) Var_Seti_with_ctxt(n, e, v, VAR_GLOBAL)
  /* Var_Appendi_with_ctxt(name, end, val, cxt);
!  *	Appends value val to variable name/end in global context ctxt, 
!  *	defining it if it does not already exist, and inserting one 
!  *	space otherwise. */
  extern void Var_Appendi_with_ctxt(const char *, const char *,
  	const char *, int);
  #define Var_Append(n, v)	Var_Appendi_with_ctxt(n, NULL, v, VAR_GLOBAL)
***************
*** 68,74 ****
  #define OODATE_INDEX	5
  #define ALLSRC_INDEX	6
  
! #define Var(idx, gn)	((gn)->context.locals[idx])
  
  
  /* SymTable_Init(t);
--- 69,75 ----
  #define OODATE_INDEX	5
  #define ALLSRC_INDEX	6
  
! #define Var(idx, gn)	((gn)->localvars.locals[idx])
  
  
  /* SymTable_Init(t);