diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index decc31bf02b9..2736946db2f7 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -98,11 +98,7 @@ static const char rcsid[] = #include "pathnames.h" #include "extern.h" -#if __STDC__ #include -#else -#include -#endif static char version[] = "Version 6.00LS"; #undef main diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c index 6769fa18a7ab..1d0f2bd64b44 100644 --- a/libexec/rtld-aout/rtld.c +++ b/libexec/rtld-aout/rtld.c @@ -51,11 +51,7 @@ #include #include #include -#if __STDC__ #include -#else -#include -#endif #include @@ -2293,19 +2289,11 @@ die __P((void)) * Generate an error message that can be later be retrieved via dlerror. */ static void -#if __STDC__ generror(char *fmt, ...) -#else -generror(fmt, va_alist) -char *fmt; -#endif { va_list ap; -#if __STDC__ + va_start(ap, fmt); -#else - va_start(ap); -#endif vsnprintf (dlerror_buf, DLERROR_BUF_SIZE, fmt, ap); dlerror_msg = dlerror_buf; @@ -2313,21 +2301,12 @@ char *fmt; } void -#if __STDC__ xprintf(char *fmt, ...) -#else -xprintf(fmt, va_alist) -char *fmt; -#endif { char buf[256]; va_list ap; -#if __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif + va_start(ap, fmt); vsnprintf(buf, sizeof(buf), fmt, ap); (void)write(STDOUT_FILENO, buf, strlen(buf)); va_end(ap);