Merge struct VarREPattern into struct VarPattern. This will help sorting

out common code.

Patch:		7.156

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

1 files changed, 5 insertions, 8 deletions

diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index adce769..bcccc13 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -77,17 +77,14 @@ typedef struct {
 	size_t	leftLen;	/* Length of string */
 	char	*rhs;		/* Replacement string (w/ &'s removed) */
 	size_t	rightLen;	/* Length of replacement */
+
+	regex_t			re;
+	int			nsub;
+	regmatch_t		*matches;
+
 	int	flags;
 } VarPattern;
 
-typedef struct {
-	regex_t		re;
-	int		nsub;
-	regmatch_t	*matches;
-	char		*replace;
-	int		flags;
-} VarREPattern;
-
 typedef Boolean VarModifyProc(const char *, Boolean, struct Buffer *, void *);
 
 /*