From 45b3caadf9ddeb466f5ad6e9065a04fe8fddfb8e Mon Sep 17 00:00:00 2001 From: Hartmut Brandt Date: Tue, 10 May 2005 11:58:52 +0000 Subject: [PATCH] Move the declaration of VAR_CMD and VAR_GLOBAL from globals.h to var.h Patch: 7.196 Submitted by: Max Okumoto --- usr.bin/make/globals.h | 6 ------ usr.bin/make/var.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/make/globals.h b/usr.bin/make/globals.h index fa6c260ea54d..a355f30a1553 100644 --- a/usr.bin/make/globals.h +++ b/usr.bin/make/globals.h @@ -103,12 +103,6 @@ extern Lst envFirstVars; extern struct GNode *DEFAULT; /* .DEFAULT rule */ -/* Variables defined in a global context, e.g in the Makefile itself */ -extern struct GNode *VAR_GLOBAL; - -/* Variables defined on the command line */ -extern struct GNode *VAR_CMD; - /* Value returned by Var_Parse when an error is encountered. It actually * points to an empty string, so naive callers needn't worry about it. */ extern char var_Error[]; diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h index 6de80d38e0ce..5f1948db9d7e 100644 --- a/usr.bin/make/var.h +++ b/usr.bin/make/var.h @@ -45,6 +45,12 @@ struct GNode; struct Buffer; +/* Variables defined in a global context, e.g in the Makefile itself */ +extern struct GNode *VAR_GLOBAL; + +/* Variables defined on the command line */ +extern struct GNode *VAR_CMD; + void Var_Append(const char *, const char *, struct GNode *); void Var_Delete(const char *, struct GNode *); void Var_Dump(void);