From 948c8ccbaa5b9c63a3a92f3dd55a1ea76aec5413 Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Tue, 6 Oct 2015 21:19:06 +0000
Subject: [PATCH] Move tree.c protos into tree.h, from Michael McConville, ok
 millert

---
 bin/ksh/proto.h | 10 +---------
 bin/ksh/tree.h  | 10 +++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/ksh/proto.h b/bin/ksh/proto.h
index 44159319172..a00f33f12d8 100644
--- a/bin/ksh/proto.h
+++ b/bin/ksh/proto.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proto.h,v 1.36 2015/09/14 16:08:50 nicm Exp $	*/
+/*	$OpenBSD: proto.h,v 1.37 2015/10/06 21:19:06 nicm Exp $	*/
 
 /*
  * prototypes for PD-KSH
@@ -232,14 +232,6 @@ int	block_pipe(void);
 void	restore_pipe(int);
 int	setsig(Trap *, sig_t, int);
 void	setexecsig(Trap *, int);
-/* tree.c */
-void	fptreef(struct shf *, int, const char *, ...);
-char *	snptreef(char *, int, const char *, ...);
-struct op *	tcopy(struct op *, Area *);
-char *	wdcopy(const char *, Area *);
-char *	wdscan(const char *, int);
-char *	wdstrip(const char *);
-void	tfree(struct op *, Area *);
 /* var.c */
 void	newblock(void);
 void	popblock(void);
diff --git a/bin/ksh/tree.h b/bin/ksh/tree.h
index 49092ae3301..2c613bd20f9 100644
--- a/bin/ksh/tree.h
+++ b/bin/ksh/tree.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.h,v 1.10 2005/03/28 21:28:22 deraadt Exp $	*/
+/*	$OpenBSD: tree.h,v 1.11 2015/10/06 21:19:06 nicm Exp $	*/
 
 /*
  * command trees for compile/execute
@@ -139,3 +139,11 @@ struct ioword {
 #define DB_AND	3		/* && -> -a conversion */
 #define DB_BE	4		/* an inserted -BE */
 #define DB_PAT	5		/* a pattern argument */
+
+void	fptreef(struct shf *, int, const char *, ...);
+char *	snptreef(char *, int, const char *, ...);
+struct op *	tcopy(struct op *, Area *);
+char *	wdcopy(const char *, Area *);
+char *	wdscan(const char *, int);
+char *	wdstrip(const char *);
+void	tfree(struct op *, Area *);
-- 
2.20.1