Move declarations of variables belonging to the variable module

from globals.h into var.h.

Submitted by:	Max Okumoto <okumoto@ucsd.edu> (7.209)

2 files changed, 9 insertions, 6 deletions

diff --git a/usr.bin/make/globals.h b/usr.bin/make/globals.h
index a355f30..e8d66c0 100644
--- a/usr.bin/make/globals.h
+++ b/usr.bin/make/globals.h
@@ -103,15 +103,9 @@ extern Lst envFirstVars;
 
 extern struct GNode	*DEFAULT;	/* .DEFAULT rule */
 
-/* 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[];
-
 /* The time at the start of this whole process */
 extern time_t	now;
 
-extern Boolean	oldVars;	/* Do old-style variable substitution */
-
 extern int debug;
 
 /* warning flags */
diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index 2294b95..42cdd93 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -51,6 +51,15 @@ 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[];
+
+/* Do old-style variable substitution */
+extern Boolean		oldVars;
+
 void Var_Append(const char *, const char *, struct GNode *);
 void Var_Delete(const char *, struct GNode *);
 void Var_Dump(void);