Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a

merge of parallel duplicate work by Steve Price and myself. :-]

There are some changes to the build that are my fault...  mkinit.c was
trying (poorly) to duplicate some of the work that make(1) is designed to
do.  The Makefile hackery is my fault too, the depend list was incomplete
because of some explicit OBJS+= entries, so mkdep wasn't picking up their
source file #includes.

This closes a pile of /bin/sh PR's, but not all of them..

Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter

1 files changed, 8 insertions, 15 deletions

diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index 05842bb..14acdb6 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -33,25 +33,18 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)redir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	@(#)redir.h	8.2 (Berkeley) 5/4/95
+ *	$Id: redir.h,v 1.2 1994/09/24 02:58:11 davidg Exp $
  */
 
 /* flags passed to redirect */
 #define REDIR_PUSH 01		/* save previous values of file descriptors */
 #define REDIR_BACKQ 02		/* save the command output in memory */
 
-#ifdef __STDC__
 union node;
-void redirect(union node *, int);
-void popredir(void);
-void clearredir(void);
-int copyfd(int, int);
-int fd0_redirected_p(void);
-#else
-void redirect();
-void popredir();
-void clearredir();
-int copyfd();
-int fd0_redirected_p();
-#endif
+void redirect __P((union node *, int));
+void popredir __P((void));
+int fd0_redirected_p __P((void));
+void clearredir __P((void)); 
+int copyfd __P((int, int));
+