1 files changed, 9 insertions, 16 deletions
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c
index d490ef403..77199c2c9 100644
--- a/newlib/libc/stdio/fiprintf.c
+++ b/newlib/libc/stdio/fiprintf.c
@@ -40,38 +40,31 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <stdio.h>
 
 #ifdef _HAVE_STDC
-
 #include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
 
+#ifdef _HAVE_STDC
 int
 fiprintf (FILE * fp, const char *fmt,...)
-{
-  int ret;
-  va_list ap;
-
-  va_start (ap, fmt);
-  ret = vfiprintf (fp, fmt, ap);
-  va_end (ap);
-  return ret;
-}
-
 #else
-
-#include <varargs.h>
-
 int
 fiprintf (fp, fmt, va_alist)
      FILE *fp;
      char *fmt;
      va_dcl
+#endif
 {
   int ret;
   va_list ap;
 
+#ifdef _HAVE_STDC
+  va_start (ap, fmt);
+#else
   va_start (ap);
+#endif
   ret = vfiprintf (fp, fmt, ap);
   va_end (ap);
   return ret;
 }
-
-#endif