From: Thomas Cort <tcort@minix3.org>
Date: Wed, 25 Mar 2015 18:48:08 +0000 (-0400)
Subject: mined: remove !__STDC__ code blocks.
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch11.html?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F2978%2F1;p=minix.git

mined: remove !__STDC__ code blocks.

__STDC__ is used to mitigate the differences between K&R C and the
ANSI C standard. Nearly every compiler now supports ANSI C, so
there is no need to support non-standard compilers.

Change-Id: Ifc3381ecf1c43dfde9004bee48552d8b3ac4dcdc
---

diff --git a/minix/commands/mined/mined.h b/minix/commands/mined/mined.h
index 6b1f884a8..b8a53cee0 100644
--- a/minix/commands/mined/mined.h
+++ b/minix/commands/mined/mined.h
@@ -258,11 +258,7 @@ int ask_save(void);
 int line_number(void);
 void file_status(char *message, long count, char *file, int lines, FLAG
 	writefl, FLAG changed );
-#if __STDC__
 void build_string(char *buf, char *fmt, ...);
-#else
-void build_string();
-#endif
 char *num_out(long number );
 int get_number(char *message, int *result );
 int input(char *inbuf, FLAG clearfl );
diff --git a/minix/commands/mined/mined1.c b/minix/commands/mined/mined1.c
index de8bd6d1f..043f434c9 100644
--- a/minix/commands/mined/mined1.c
+++ b/minix/commands/mined/mined1.c
@@ -411,11 +411,7 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 extern int errno;
 int ymax = YMAX;
@@ -1557,21 +1553,12 @@ void file_status(char *message, register long count, char *file, int lines,
  * Build_string() prints the arguments as described in fmt, into the buffer.
  * %s indicates an argument string, %d indicated an argument number.
  */
-#if __STDC__
 void build_string(char *buf, char *fmt, ...)
 {
-#else
-void build_string(char *buf, char *fmt, va_dcl va_alist)
-{
-#endif
   va_list argptr;
   char *scanp;
 
-#if __STDC__
   va_start(argptr, fmt);
-#else
-  va_start(argptr);
-#endif
 
   while (*fmt) {
   	if (*fmt == '%') {