ansification: remove _AND

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

40 files changed, 84 insertions, 84 deletions

diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
index fc7dc2143..a2751af85 100644
--- a/newlib/libc/machine/microblaze/strcmp.c
+++ b/newlib/libc/machine/microblaze/strcmp.c
@@ -82,7 +82,7 @@ QUICKREF
 
 int
 _DEFUN (strcmp, (s1, s2),
-	_CONST char *s1 _AND
+	_CONST char *s1,
 	_CONST char *s2)
 { 
 
diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
index 44ba382c7..e0e1d7760 100644
--- a/newlib/libc/machine/microblaze/strcpy.c
+++ b/newlib/libc/machine/microblaze/strcpy.c
@@ -82,7 +82,7 @@ QUICKREF
 
 char*
 _DEFUN (strcpy, (dst0, src0),
-	char *__restrict dst0 _AND
+	char *__restrict dst0,
 	_CONST char *__restrict src0)
 {
 
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
index 30379c579..5115c85e2 100644
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ b/newlib/libc/machine/powerpc/atosfix16.c
@@ -63,7 +63,7 @@ PORTABILITY
 
 __int16_t
 _DEFUN (_atosfix16_r, (reent, s),
-	struct _reent *reent _AND
+	struct _reent *reent,
 	_CONST char *s)
 {
   return _strtosfix16_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
index dbcac7e2f..49f4cce20 100644
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ b/newlib/libc/machine/powerpc/atosfix32.c
@@ -9,7 +9,7 @@
 
 __int32_t
 _DEFUN (_atosfix32_r, (reent, s),
-	struct _reent *reent _AND
+	struct _reent *reent,
 	_CONST char *s)
 {
   return _strtosfix32_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
index 109baf7b6..b433778e7 100644
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ b/newlib/libc/machine/powerpc/atosfix64.c
@@ -9,7 +9,7 @@
 
 __int64_t
 _DEFUN (_atosfix64_r, (reent, s),
-	struct _reent *reent _AND
+	struct _reent *reent,
 	_CONST char *s)
 {
   return _strtosfix64_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
index 45d130fac..5148acb7d 100644
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ b/newlib/libc/machine/powerpc/atoufix16.c
@@ -63,7 +63,7 @@ PORTABILITY
 
 __uint16_t
 _DEFUN (_atoufix16_r, (reent, s),
-	struct _reent *reent _AND
+	struct _reent *reent,
 	_CONST char *s)
 {
   return _strtoufix16_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
index ee29ac586..01919d406 100644
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ b/newlib/libc/machine/powerpc/atoufix32.c
@@ -9,7 +9,7 @@
 
 __uint32_t
 _DEFUN (_atoufix32_r, (reent, s),
-	struct _reent *reent _AND
+	struct _reent *reent,
 	_CONST char *s)
 {
   return _strtoufix32_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
index e5eefc423..af71089a6 100644
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ b/newlib/libc/machine/powerpc/atoufix64.c
@@ -9,7 +9,7 @@
 
 __uint64_t
 _DEFUN (_atoufix64_r, (reent, s),
-	struct _reent *reent _AND
+	struct _reent *reent,
 	_CONST char *s)
 {
   return _strtoufix64_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
index e39887dc1..84e1171b9 100644
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ b/newlib/libc/machine/powerpc/strtosfix16.c
@@ -93,8 +93,8 @@ PORTABILITY
  */
 __int16_t
 _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
+	struct _reent *rptr,
+	_CONST char *nptr,
 	char **endptr)
 {
   union double_union dbl;
@@ -170,7 +170,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
 
 __int16_t
 _DEFUN (strtosfix16, (s, ptr, base),
-	_CONST char *s _AND
+	_CONST char *s,
 	char **ptr)
 {
   return _strtosfix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix32.c b/newlib/libc/machine/powerpc/strtosfix32.c
index 2e22c1458..1b1487b1a 100644
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ b/newlib/libc/machine/powerpc/strtosfix32.c
@@ -14,8 +14,8 @@
  */
 __int32_t
 _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
+	struct _reent *rptr,
+	_CONST char *nptr,
 	char **endptr)
 {
   union double_union dbl;
@@ -93,7 +93,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
 
 __int32_t
 _DEFUN (strtosfix32, (s, ptr, base),
-	_CONST char *s _AND
+	_CONST char *s,
 	char **ptr)
 {
   return _strtosfix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix64.c b/newlib/libc/machine/powerpc/strtosfix64.c
index 3006632a4..4ba718c03 100644
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ b/newlib/libc/machine/powerpc/strtosfix64.c
@@ -14,8 +14,8 @@
  */
 __int64_t
 _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
+	struct _reent *rptr,
+	_CONST char *nptr,
 	char **endptr)
 {
   union long_double_union ldbl;
@@ -106,7 +106,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
 
 __int64_t
 _DEFUN (strtosfix64, (s, ptr, base),
-	_CONST char *s _AND
+	_CONST char *s,
 	char **ptr)
 {
   return _strtosfix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix16.c b/newlib/libc/machine/powerpc/strtoufix16.c
index 3bf2d6b29..22de506e3 100644
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ b/newlib/libc/machine/powerpc/strtoufix16.c
@@ -92,8 +92,8 @@ PORTABILITY
  */
 __uint16_t
 _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
+	struct _reent *rptr,
+	_CONST char *nptr,
 	char **endptr)
 {
   union double_union dbl;
@@ -161,7 +161,7 @@ _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
 
 __uint16_t
 _DEFUN (strtoufix16, (s, ptr, base),
-	_CONST char *s _AND
+	_CONST char *s,
 	char **ptr)
 {
   return _strtoufix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix32.c b/newlib/libc/machine/powerpc/strtoufix32.c
index 6a8e0812f..05e96675f 100644
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ b/newlib/libc/machine/powerpc/strtoufix32.c
@@ -14,8 +14,8 @@
  */
 __uint32_t
 _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
+	struct _reent *rptr,
+	_CONST char *nptr,
 	char **endptr)
 {
   union double_union dbl;
@@ -90,7 +90,7 @@ _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
 
 __uint32_t
 _DEFUN (strtoufix32, (s, ptr, base),
-	_CONST char *s _AND
+	_CONST char *s,
 	char **ptr)
 {
   return _strtoufix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix64.c b/newlib/libc/machine/powerpc/strtoufix64.c
index 539f953a4..5ef53846f 100644
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ b/newlib/libc/machine/powerpc/strtoufix64.c
@@ -14,8 +14,8 @@
  */
 __uint64_t
 _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
+	struct _reent *rptr,
+	_CONST char *nptr,
 	char **endptr)
 {
   union long_double_union ldbl;
@@ -105,7 +105,7 @@ _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
 
 __uint64_t
 _DEFUN (strtoufix64, (s, ptr, base),
-	_CONST char *s _AND
+	_CONST char *s,
 	char **ptr)
 {
   return _strtoufix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/ufix64toa.c b/newlib/libc/machine/powerpc/ufix64toa.c
index 450e0a352..125ab67fa 100644
--- a/newlib/libc/machine/powerpc/ufix64toa.c
+++ b/newlib/libc/machine/powerpc/ufix64toa.c
@@ -26,12 +26,12 @@ extern char *_simdldtoa_r _PARAMS((struct _reent *, LONG_DOUBLE_UNION *, int,
 
 char *
 _DEFUN (_ufix64toa_r, (rptr, value, mode, ndigits, decpt, sign, rve),
-	struct _reent *rptr _AND
-	__uint64_t value _AND
-	int mode _AND
-	int ndigits _AND
-	int *decpt _AND
-	int *sign _AND
+	struct _reent *rptr,
+	__uint64_t value,
+	int mode,
+	int ndigits,
+	int *decpt,
+	int *sign,
 	char **rve)
 {
   union long_double_union ldbl;
diff --git a/newlib/libc/machine/powerpc/vec_calloc.c b/newlib/libc/machine/powerpc/vec_calloc.c
index 8b2e835f0..8a10507d3 100644
--- a/newlib/libc/machine/powerpc/vec_calloc.c
+++ b/newlib/libc/machine/powerpc/vec_calloc.c
@@ -45,7 +45,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 _PTR
 _DEFUN (vec_calloc, (n, size),
-	size_t n _AND
+	size_t n,
 	size_t size)
 {
   return _vec_calloc_r (_REENT, n, size);
diff --git a/newlib/libc/machine/powerpc/vec_realloc.c b/newlib/libc/machine/powerpc/vec_realloc.c
index e192e399d..7e857b55a 100644
--- a/newlib/libc/machine/powerpc/vec_realloc.c
+++ b/newlib/libc/machine/powerpc/vec_realloc.c
@@ -8,7 +8,7 @@
 
 _PTR
 _DEFUN (vec_realloc, (ap, nbytes),
-	_PTR ap _AND
+	_PTR ap,
 	size_t nbytes)
 {
   return _vec_realloc_r (_REENT, ap, nbytes);
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index e0b90fcde..0c1c80e1a 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -272,8 +272,8 @@ static char *cvt_ufix64 _PARAMS((struct _reent *, unsigned long long, int,  int
 
 int 
 _DEFUN (VFPRINTF, (fp, fmt0, ap),
-	FILE * fp _AND
-	_CONST char *fmt0 _AND
+	FILE * fp,
+	_CONST char *fmt0,
 	va_list ap)
 {
   CHECK_INIT (_REENT, fp);
@@ -282,9 +282,9 @@ _DEFUN (VFPRINTF, (fp, fmt0, ap),
 
 int 
 _DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
-	struct _reent *data _AND
-	FILE * fp _AND
-	_CONST char *fmt0 _AND
+	struct _reent *data,
+	FILE * fp,
+	_CONST char *fmt0,
 	va_list ap)
 {
 	register char *fmt;	/* format string */
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index 6cbc624de..b82a14088 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -183,8 +183,8 @@ typedef union
 
 int
 _DEFUN (vfscanf, (fp, fmt, ap), 
-    register FILE *__restrict fp _AND 
-    _CONST char *__restrict fmt _AND 
+    register FILE *__restrict fp,
+    _CONST char *__restrict fmt,
     va_list ap)
 {
   CHECK_INIT(_REENT, fp);
@@ -204,9 +204,9 @@ __svfscanf (fp, fmt0, ap)
 
 int
 _DEFUN (_vfscanf_r, (data, fp, fmt, ap),
-    struct _reent *data _AND 
-    register FILE *__restrict fp _AND 
-    _CONST char *__restrict fmt _AND 
+    struct _reent *data,
+    register FILE *__restrict fp,
+    _CONST char *__restrict fmt,
     va_list ap)
 {
   return __svfscanf_r (data, fp, fmt, ap);
diff --git a/newlib/libc/machine/spu/assert.c b/newlib/libc/machine/spu/assert.c
index f1dd33047..e8028459c 100644
--- a/newlib/libc/machine/spu/assert.c
+++ b/newlib/libc/machine/spu/assert.c
@@ -11,9 +11,9 @@
 /* func can be NULL, in which case no function information is given.  */
 void
 _DEFUN (__assert_func, (file, line, func, failedexpr),
-	const char *file _AND
-	int line _AND
-	const char *func _AND
+	const char *file,
+	int line,
+	const char *func,
 	const char *failedexpr)
 {
   fprintf(stderr,
@@ -32,8 +32,8 @@ _DEFUN (__assert_func, (file, line, func, failedexpr),
 
 void
 _DEFUN (__assert, (file, line, failedexpr),
-	const char *file _AND
-	int line _AND
+	const char *file,
+	int line,
 	const char *failedexpr)
 {
    __assert_func (file, line, NULL, failedexpr);
diff --git a/newlib/libc/machine/spu/creat.c b/newlib/libc/machine/spu/creat.c
index 3cd714306..0e271c1a7 100644
--- a/newlib/libc/machine/spu/creat.c
+++ b/newlib/libc/machine/spu/creat.c
@@ -8,7 +8,7 @@
 
 int
 _DEFUN(creat, (path, mode),
-       const char *path _AND
+       const char *path,
        mode_t mode)
 {
   return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
diff --git a/newlib/libc/machine/spu/fdopen.c b/newlib/libc/machine/spu/fdopen.c
index a795db8b5..b09ffad16 100644
--- a/newlib/libc/machine/spu/fdopen.c
+++ b/newlib/libc/machine/spu/fdopen.c
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* Just a stub for now.  */
 FILE *
 _DEFUN (fdopen, (fd, mode),
-        int fd _AND
+        int fd,
         _CONST char *mode)
 {
   errno = ENOSYS;
diff --git a/newlib/libc/machine/spu/fgetpos.c b/newlib/libc/machine/spu/fgetpos.c
index 694400e48..bb7d780ea 100644
--- a/newlib/libc/machine/spu/fgetpos.c
+++ b/newlib/libc/machine/spu/fgetpos.c
@@ -45,7 +45,7 @@ typedef struct
 
 int
 _DEFUN (fgetpos, (fp, pos),
-	FILE *__restrict fp _AND
+	FILE *__restrict fp,
 	_fpos_t *__restrict pos)
 {
   c99_fgetpos_t arg;
diff --git a/newlib/libc/machine/spu/fgets.c b/newlib/libc/machine/spu/fgets.c
index 2b0ca417e..8f2a9785f 100644
--- a/newlib/libc/machine/spu/fgets.c
+++ b/newlib/libc/machine/spu/fgets.c
@@ -47,8 +47,8 @@ typedef struct
 
 char *
 _DEFUN (fgets, (buf, n, fp),
-	char *__restrict buf _AND
-	int n _AND
+	char *__restrict buf,
+	int n,
 	FILE *__restrict fp)
 {
   c99_fgets_t args;
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index 821d7c201..c41d33510 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -46,7 +46,7 @@ typedef struct
 #ifndef _REENT_ONLY
 FILE *
 _DEFUN (fopen, (file, mode),
-	_CONST char *__restrict file _AND
+	_CONST char *__restrict file,
 	_CONST char *__restrict mode)
 {
   int ret;
diff --git a/newlib/libc/machine/spu/fputs.c b/newlib/libc/machine/spu/fputs.c
index 9ed796894..8cf84bb6e 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -47,7 +47,7 @@ typedef struct
 
 int
 _DEFUN (fputs, (s, fp),
-	char _CONST *__restrict s _AND
+	char _CONST *__restrict s,
 	FILE *__restrict fp)
 {
   c99_fputs_t args;
diff --git a/newlib/libc/machine/spu/fread.c b/newlib/libc/machine/spu/fread.c
index eb3966c19..3ea24cc4a 100644
--- a/newlib/libc/machine/spu/fread.c
+++ b/newlib/libc/machine/spu/fread.c
@@ -50,9 +50,9 @@ typedef struct
 
 size_t
 _DEFUN (fread, (buf, size, count, fp),
-	_PTR __restrict  buf _AND
-	size_t size _AND
-	size_t count _AND
+	_PTR __restrict  buf,
+	size_t size,
+	size_t count,
 	FILE *__restrict fp)
 {
   c99_fread_t args;
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 53dd2bc1d..7c52abef3 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -48,8 +48,8 @@ typedef struct
 
 FILE *
 _DEFUN (freopen, (file, mode, fp),
-	const char *__restrict file _AND
-	const char *__restrict mode _AND
+	const char *__restrict file,
+	const char *__restrict mode,
 	FILE *__restrict fp)
 {
   int ret;
diff --git a/newlib/libc/machine/spu/fseek.c b/newlib/libc/machine/spu/fseek.c
index dc7453325..136d5c639 100644
--- a/newlib/libc/machine/spu/fseek.c
+++ b/newlib/libc/machine/spu/fseek.c
@@ -48,8 +48,8 @@ typedef struct
 
 int
 _DEFUN (fseek, (fp, offset, whence),
-     register FILE *fp _AND
-     long offset _AND
+     register FILE *fp,
+     long offset,
      int whence)
 {
   c99_fseek_t args;
diff --git a/newlib/libc/machine/spu/fsetpos.c b/newlib/libc/machine/spu/fsetpos.c
index 3bd0dde3d..1ebbb8f63 100644
--- a/newlib/libc/machine/spu/fsetpos.c
+++ b/newlib/libc/machine/spu/fsetpos.c
@@ -46,7 +46,7 @@ typedef struct
 
 int
 _DEFUN (fsetpos, (iop, pos),
-	FILE * iop _AND
+	FILE * iop,
 	_CONST _fpos_t * pos)
 {
   c99_fsetpos_t args;
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 58aab9f0a..6de571069 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -50,9 +50,9 @@ typedef struct
 
 size_t
 _DEFUN (fwrite, (buf, size, count, fp),
-	_CONST _PTR __restrict buf _AND
-	size_t size _AND
-	size_t count _AND
+	_CONST _PTR __restrict buf,
+	size_t size,
+	size_t count,
 	FILE * fp)
 {
   c99_fwrite_t args;
diff --git a/newlib/libc/machine/spu/setbuf.c b/newlib/libc/machine/spu/setbuf.c
index 84430fc73..c942bb9a9 100644
--- a/newlib/libc/machine/spu/setbuf.c
+++ b/newlib/libc/machine/spu/setbuf.c
@@ -47,7 +47,7 @@ typedef struct
 
 void
 _DEFUN (setbuf, (fp, buf),
-	FILE *__restrict fp _AND
+	FILE *__restrict fp,
 	char *__restrict buf)
 {
   c99_setbuf_t args;
diff --git a/newlib/libc/machine/spu/setvbuf.c b/newlib/libc/machine/spu/setvbuf.c
index 32da292f9..a045cc37b 100644
--- a/newlib/libc/machine/spu/setvbuf.c
+++ b/newlib/libc/machine/spu/setvbuf.c
@@ -51,9 +51,9 @@ typedef struct
 
 int
 _DEFUN (setvbuf, (fp, buf, mode, size),
-	FILE * fp _AND
-	char *buf _AND
-	int mode _AND
+	FILE * fp,
+	char *buf,
+	int mode,
 	size_t size)
 {
   c99_setvbuf_t args;
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index 128d0b3eb..e5ef2fa9f 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vfprintf, (fp, fmt0, ap),
-	FILE *__restrict fp _AND
-	_CONST char *__restrict fmt0 _AND
+	FILE *__restrict fp,
+	_CONST char *__restrict fmt0,
 	va_list ap)
 {
   c99_vfprintf_t args;
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index 0f728969f..a497b7ba3 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vfscanf, (fp, fmt, ap),
-    FILE *__restrict fp _AND
-    _CONST char *__restrict fmt _AND
+    FILE *__restrict fp,
+    _CONST char *__restrict fmt,
     va_list ap)
 {
   c99_vfscanf_t args;
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index 32b86d8f2..35b12dfb5 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -24,7 +24,7 @@ typedef struct
 
 int
 _DEFUN (vprintf, (fmt, ap),
-     _CONST char *fmt _AND
+     _CONST char *fmt,
      va_list ap)
 {
   c99_vprintf_t args;
diff --git a/newlib/libc/machine/spu/vscanf.c b/newlib/libc/machine/spu/vscanf.c
index 4f68bfefd..29b4948dd 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -56,7 +56,7 @@ typedef struct
 
 int
 _DEFUN (vscanf, (fmt, ap),
-     _CONST char *fmt _AND
+     _CONST char *fmt,
      va_list ap)
 {
   c99_vscanf_t args;
diff --git a/newlib/libc/machine/spu/vsnprintf.c b/newlib/libc/machine/spu/vsnprintf.c
index cf4f5e709..f952b84c1 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -28,9 +28,9 @@ typedef struct
 
 int
 _DEFUN (vsnprintf, (str, size, fmt, ap),
-     char *__restrict str _AND
-     size_t size _AND
-     _CONST char *__restrict fmt _AND
+     char *__restrict str,
+     size_t size,
+     _CONST char *__restrict fmt,
      va_list ap)
 {
   c99_vsnprintf_t args;
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 0719d38f5..1a44de479 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -27,8 +27,8 @@ typedef struct
 
 int
 _DEFUN (vsprintf, (str, fmt, ap),
-     char *__restrict str _AND
-     _CONST char *__restrict fmt _AND
+     char *__restrict str,
+     _CONST char *__restrict fmt,
      va_list ap)
 {
   c99_vsprintf_t args;
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index 2f7380ff4..38ee1f4b9 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -58,8 +58,8 @@ typedef struct
 
 int
 _DEFUN (vsscanf, (str, fmt, ap),
-    _CONST char *__restrict str _AND
-    _CONST char *__restrict fmt _AND
+    _CONST char *__restrict str,
+    _CONST char *__restrict fmt,
     va_list ap)
 {
   c99_vsscanf_t args;