o __P has been reoved

o Old-style K&R declarations have been converted to new C89 style
o register has been removed
o prototype for main() has been removed (gcc3 makes it an error)
o int main(int argc, char *argv[]) is the preferred main definition.
o Attempt to not break style(9) conformance for declarations more than
  they already are.
o Change
	int
	foo() {
	...
  to
	int
	foo(void)
	{
	...

2 files changed, 1 insertions, 8 deletions

diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index 5d2b02a..9d6e68d 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -83,13 +83,8 @@
 #define INITARGS(argv)	if ((commandname = argv[0]) == NULL) {fputs("Argc is zero\n", stderr); exit(2);} else
 #endif
 
-#ifdef __STDC__
 pointer stalloc(int);
 void error(const char *, ...) __printf0like(1, 2);
-#else
-pointer stalloc();
-void error();
-#endif
 
 
 extern char *commandname;
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 850a811..ef82dc6 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -48,9 +48,7 @@
 /* #define eflag 1 */
 
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char *argv[])
 {
 	char **ap;
 	char *p;