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/expand.h b/bin/sh/expand.h
index 6af4360..4d621a3 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -33,8 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)expand.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	@(#)expand.h	8.2 (Berkeley) 5/4/95
+ *	$Id: expand.h,v 1.2 1994/09/24 02:57:35 davidg Exp $
  */
 
 struct strlist {
@@ -58,17 +58,10 @@ struct arglist {
 #define EXP_CASE	0x10	/* keeps quotes around for CASE pattern */
 
 
-#ifdef __STDC__
 union node;
-void expandarg(union node *, struct arglist *, int);
-void expandhere(union node *, int);
-int patmatch(char *, char *);
-void rmescapes(char *);
-int casematch(union node *, char *);
-#else
-void expandarg();
-void expandhere();
-int patmatch();
-void rmescapes();
-int casematch();
-#endif
+void expandhere __P((union node *, int));
+void expandarg __P((union node *, struct arglist *, int));
+void expari __P((int));
+int patmatch __P((char *, char *));
+void rmescapes __P((char *));
+int casematch __P((union node *, char *));