ansification: remove _HAVE_STDC

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

18 files changed, 0 insertions, 306 deletions

diff --git a/newlib/libc/stdio/fiscanf.c b/newlib/libc/stdio/fiscanf.c
index 7b497bddb..ea93f7542 100644
--- a/newlib/libc/stdio/fiscanf.c
+++ b/newlib/libc/stdio/fiscanf.c
@@ -18,33 +18,18 @@
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY
 
 int
-#ifdef _HAVE_STDC
 fiscanf(FILE *fp, const char *fmt, ...)
-#else
-fiscanf(FILE *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 = __svfiscanf_r (_REENT, fp, fmt, ap);
   va_end (ap);
   return ret;
@@ -53,24 +38,12 @@ fiscanf(FILE *fp, fmt, va_alist)
 #endif /* !_REENT_ONLY */
 
 int
-#ifdef _HAVE_STDC
 _fiscanf_r(struct _reent *ptr, FILE *fp, const char *fmt, ...)
-#else
-_fiscanf_r(ptr, FILE *fp, fmt, va_alist)
-          struct _reent *ptr;
-          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 = __svfiscanf_r (ptr, fp, fmt, ap);
   va_end (ap);
   return (ret);
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index 94096a22b..af01eedbe 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -18,33 +18,18 @@
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY
 
 int
-#ifdef _HAVE_STDC
 fscanf(FILE *__restrict fp, const char *__restrict fmt, ...)
-#else
-fscanf(FILE *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 = _vfscanf_r (_REENT, fp, fmt, ap);
   va_end (ap);
   return ret;
@@ -59,24 +44,12 @@ fiscanf (FILE *, const char *, ...)
 #endif /* !_REENT_ONLY */
 
 int
-#ifdef _HAVE_STDC
 _fscanf_r(struct _reent *ptr, FILE *__restrict fp, const char *__restrict fmt, ...)
-#else
-_fscanf_r(ptr, FILE *fp, fmt, va_alist)
-          struct _reent *ptr;
-          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 = _vfscanf_r (ptr, fp, fmt, ap);
   va_end (ap);
   return (ret);
diff --git a/newlib/libc/stdio/iscanf.c b/newlib/libc/stdio/iscanf.c
index aefd1a4ac..980dabd29 100644
--- a/newlib/libc/stdio/iscanf.c
+++ b/newlib/libc/stdio/iscanf.c
@@ -18,33 +18,19 @@
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY
 
 int
-#ifdef _HAVE_STDC
 iscanf(const char *fmt, ...)
-#else
-iscanf(fmt, va_alist)
-      char *fmt;
-      va_dcl
-#endif
 {
   int ret;
   va_list ap;
 
   _REENT_SMALL_CHECK_INIT (_REENT);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = __svfiscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
   va_end (ap);
   return ret;
@@ -53,24 +39,13 @@ iscanf(fmt, va_alist)
 #endif /* !_REENT_ONLY */
 
 int
-#ifdef _HAVE_STDC
 _iscanf_r(struct _reent *ptr, const char *fmt, ...)
-#else
-_iscanf_r(ptr, fmt, va_alist)
-         struct _reent *ptr;
-         char *fmt;
-         va_dcl
-#endif
 {
   int ret;
   va_list ap;
 
   _REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = __svfiscanf_r (ptr, _stdin_r (ptr), fmt, ap);
   va_end (ap);
   return (ret);
diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index a5a9391c0..898c6e7af 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -18,34 +18,20 @@
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY
 
 int
-#ifdef _HAVE_STDC
 scanf(const char *__restrict fmt, ...)
-#else
-scanf(fmt, va_alist)
-      char *fmt;
-      va_dcl
-#endif
 {
   int ret;
   va_list ap;
   struct _reent *reent = _REENT;
 
   _REENT_SMALL_CHECK_INIT (reent);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _vfscanf_r (reent, _stdin_r (reent), fmt, ap);
   va_end (ap);
   return ret;
@@ -60,24 +46,13 @@ iscanf (const char *, ...)
 #endif /* !_REENT_ONLY */
 
 int
-#ifdef _HAVE_STDC
 _scanf_r(struct _reent *ptr, const char *__restrict fmt, ...)
-#else
-_scanf_r(ptr, fmt, va_alist)
-         struct _reent *ptr;
-         char *fmt;
-         va_dcl
-#endif
 {
   int ret;
   va_list ap;
 
   _REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _vfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
   va_end (ap);
   return (ret);
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index 6ec24777e..be000f629 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -94,26 +94,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <limits.h>
 #include "local.h"
 
 int
-#ifdef _HAVE_STDC
 _siprintf_r (struct _reent *ptr,
        char *str,
        const char *fmt, ...)
-#else
-_siprintf_r(ptr, str, fmt, va_alist)
-           struct _reent *ptr;
-           char *str;
-           const char *fmt;
-           va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -123,11 +111,7 @@ _siprintf_r(ptr, str, fmt, va_alist)
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _svfiprintf_r (ptr, &f, fmt, ap);
   va_end (ap);
   *f._p = 0;
@@ -137,15 +121,8 @@ _siprintf_r(ptr, str, fmt, va_alist)
 #ifndef _REENT_ONLY
 
 int
-#ifdef _HAVE_STDC
 siprintf (char *str,
        const char *fmt, ...)
-#else
-siprintf(str, fmt, va_alist)
-        char *str;
-        const char *fmt;
-        va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -155,11 +132,7 @@ siprintf(str, fmt, va_alist)
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _svfiprintf_r (_REENT, &f, fmt, ap);
   va_end (ap);
   *f._p = 0;
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index 9b45ecdbb..355d2662a 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -76,26 +76,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <reent.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY 
 
-#ifdef _HAVE_STDC
 int 
 siscanf (const char *str,
        const char *fmt, ...)
-#else
-int 
-siscanf(str, fmt, va_alist)
-       const char *str;
-       const char *fmt;
-       va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -108,11 +96,7 @@ siscanf(str, fmt, va_alist)
   f._ub._base = NULL;
   f._lb._base = NULL;
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = __ssvfiscanf_r (_REENT, &f, fmt, ap);
   va_end (ap);
   return ret;
@@ -120,19 +104,10 @@ siscanf(str, fmt, va_alist)
 
 #endif /* !_REENT_ONLY */
 
-#ifdef _HAVE_STDC
 int 
 _siscanf_r (struct _reent *ptr,
        const char *str,
        const char *fmt, ...)
-#else
-int 
-_siscanf_r(ptr, str, fmt, va_alist)
-          struct _reent *ptr;
-          const char *str;
-          const char *fmt;
-          va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -145,11 +120,7 @@ _siscanf_r(ptr, str, fmt, va_alist)
   f._ub._base = NULL;
   f._lb._base = NULL;
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = __ssvfiscanf_r (ptr, &f, fmt, ap);
   va_end (ap);
   return ret;
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index d13278437..840c564dc 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -21,29 +21,16 @@
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <limits.h>
 #include <errno.h>
 #include "local.h"
 
 int
-#ifdef _HAVE_STDC
 _sniprintf_r (struct _reent *ptr,
 	char *str,
 	size_t size,
 	const char *fmt, ...)
-#else
-_sniprintf_r (ptr, str, size, fmt, va_alist)
-     struct _reent *ptr;
-     char *str;
-     size_t size;
-     const char *fmt;
-     va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -58,11 +45,7 @@ _sniprintf_r (ptr, str, size, fmt, va_alist)
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = (size > 0 ? size - 1 : 0);
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _svfiprintf_r (ptr, &f, fmt, ap);
   va_end (ap);
   if (ret < EOF)
@@ -75,17 +58,9 @@ _sniprintf_r (ptr, str, size, fmt, va_alist)
 #ifndef _REENT_ONLY
 
 int
-#ifdef _HAVE_STDC
 sniprintf (char *str,
 	size_t size,
 	const char *fmt, ...)
-#else
-sniprintf (str, size, fmt, va_alist)
-     char *str;
-     size_t size;
-     const char *fmt;
-     va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -101,11 +76,7 @@ sniprintf (str, size, fmt, va_alist)
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = (size > 0 ? size - 1 : 0);
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _svfiprintf_r (ptr, &f, fmt, ap);
   va_end (ap);
   if (ret < EOF)
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index d73cdbf3a..809b52b51 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -20,29 +20,16 @@
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <limits.h>
 #include <errno.h>
 #include "local.h"
 
 int
-#ifdef _HAVE_STDC
 _snprintf_r (struct _reent *ptr,
        char *__restrict str,
        size_t size,
        const char *__restrict fmt, ...)
-#else
-_snprintf_r(ptr, str, size, fmt, va_alist)
-            struct _reent *ptr;
-            char *str;
-            size_t size;
-            const char *fmt;
-            va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -57,11 +44,7 @@ _snprintf_r(ptr, str, size, fmt, va_alist)
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = (size > 0 ? size - 1 : 0);
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _svfprintf_r (ptr, &f, fmt, ap);
   va_end (ap);
   if (ret < EOF)
@@ -80,17 +63,9 @@ _sniprintf_r (struct _reent *, char *, size_t, const char *, ...)
 #ifndef _REENT_ONLY
 
 int
-#ifdef _HAVE_STDC
 snprintf (char *__restrict str,
        size_t size,
        const char *__restrict fmt, ...)
-#else
-snprintf(str, size, fmt, va_alist)
-         char *str;
-         size_t size;
-         const char *fmt;
-         va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -106,11 +81,7 @@ snprintf(str, size, fmt, va_alist)
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = (size > 0 ? size - 1 : 0);
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _svfprintf_r (ptr, &f, fmt, ap);
   va_end (ap);
   if (ret < EOF)
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 37d92f93e..096ca216a 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -570,26 +570,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <limits.h>
 #include "local.h"
 
 int
-#ifdef _HAVE_STDC
 _sprintf_r (struct _reent *ptr,
        char *__restrict str,
        const char *__restrict fmt, ...)
-#else
-_sprintf_r(ptr, str, fmt, va_alist)
-           struct _reent *ptr;
-           char *__restrict str;
-           const char *__restrict fmt;
-           va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -599,11 +587,7 @@ _sprintf_r(ptr, str, fmt, va_alist)
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _svfprintf_r (ptr, &f, fmt, ap);
   va_end (ap);
   *f._p = '\0';	/* terminate the string */
@@ -619,15 +603,8 @@ _siprintf_r (struct _reent *, char *, const char *, ...)
 #ifndef _REENT_ONLY
 
 int
-#ifdef _HAVE_STDC
 sprintf (char *__restrict str,
        const char *__restrict fmt, ...)
-#else
-sprintf(str, fmt, va_alist)
-        char *str;
-        const char *fmt;
-        va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -637,11 +614,7 @@ sprintf(str, fmt, va_alist)
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = _svfprintf_r (_REENT, &f, fmt, ap);
   va_end (ap);
   *f._p = '\0';	/* terminate the string */
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index 971db439d..99054e245 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -415,26 +415,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <reent.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY 
 
-#ifdef _HAVE_STDC
 int 
 sscanf (const char *__restrict str,
        const char * fmt, ...)
-#else
-int 
-sscanf(str, fmt, va_alist)
-       const char *str;
-       const char *fmt;
-       va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -447,11 +435,7 @@ sscanf(str, fmt, va_alist)
   f._ub._base = NULL;
   f._lb._base = NULL;
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = __ssvfscanf_r (_REENT, &f, fmt, ap);
   va_end (ap);
   return ret;
@@ -465,19 +449,10 @@ siscanf (const char *, const char *, ...)
 
 #endif /* !_REENT_ONLY */
 
-#ifdef _HAVE_STDC
 int 
 _sscanf_r (struct _reent *ptr,
        const char *__restrict str,
        const char *__restrict fmt, ...)
-#else
-int 
-_sscanf_r(ptr, str, fmt, va_alist)
-          struct _reent *ptr;
-          const char *__restrict str;
-          const char *__restrict fmt;
-          va_dcl
-#endif
 {
   int ret;
   va_list ap;
@@ -490,11 +465,7 @@ _sscanf_r(ptr, str, fmt, va_alist)
   f._ub._base = NULL;
   f._lb._base = NULL;
   f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
   ret = __ssvfscanf_r (ptr, &f, fmt, ap);
   va_end (ap);
   return ret;
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index 9678815f1..a59bc9c19 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -95,11 +95,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index e5ad1dbbd..c19d1b16a 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -79,11 +79,7 @@ Supporting OS subroutines required:
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index fb46c1c1a..b195a1ecf 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -19,11 +19,7 @@
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index bbbbd0a83..567f5cb3e 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -20,11 +20,7 @@
 #include <_ansi.h>
 #include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
index 5679df056..b21dcb1a2 100644
--- a/newlib/libc/stdio/vsiscanf.c
+++ b/newlib/libc/stdio/vsiscanf.c
@@ -21,11 +21,7 @@
 #include <reent.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 /*
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 97c7bae80..f4e096b50 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -21,11 +21,7 @@
 #include <reent.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 /*
diff --git a/newlib/libc/stdio/vswscanf.c b/newlib/libc/stdio/vswscanf.c
index 90393f528..7687001ab 100644
--- a/newlib/libc/stdio/vswscanf.c
+++ b/newlib/libc/stdio/vswscanf.c
@@ -23,11 +23,7 @@
 #include <stdio.h>
 #include <wchar.h>
 #include <string.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 /*
diff --git a/newlib/libc/stdio/vwscanf.c b/newlib/libc/stdio/vwscanf.c
index 3945e79c8..1f33db6af 100644
--- a/newlib/libc/stdio/vwscanf.c
+++ b/newlib/libc/stdio/vwscanf.c
@@ -22,11 +22,7 @@
 #include <reent.h>
 #include <stdio.h>
 #include <wchar.h>
-#ifdef _HAVE_STDC
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include "local.h"
 
 #ifndef _REENT_ONLY