ansification: remove _AND

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

8 files changed, 29 insertions, 29 deletions

diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
index f386583..1a238f7 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -36,8 +36,8 @@ extern int __sflags ();
 
 FILE *
 _DEFUN (_fdopen64_r, (ptr, fd, mode),
-	struct _reent *ptr _AND
-	int fd _AND
+	struct _reent *ptr,
+	int fd,
 	_CONST char *mode)
 {
   register FILE *fp;
@@ -109,7 +109,7 @@ _DEFUN (_fdopen64_r, (ptr, fd, mode),
 
 FILE *
 _DEFUN (fdopen64, (fd, mode),
-	int fd _AND
+	int fd,
 	_CONST char *mode)
 {
   return _fdopen64_r (_REENT, fd, mode);
diff --git a/newlib/libc/stdio64/fgetpos64.c b/newlib/libc/stdio64/fgetpos64.c
index a1d0a37..e2dd289 100644
--- a/newlib/libc/stdio64/fgetpos64.c
+++ b/newlib/libc/stdio64/fgetpos64.c
@@ -46,8 +46,8 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN (_fgetpos64_r, (ptr, fp, pos),
-	struct _reent * ptr _AND
-	FILE * fp _AND
+	struct _reent * ptr,
+	FILE * fp,
 	_fpos64_t * pos)
 {
   *pos = (_fpos64_t)_ftello64_r (ptr, fp);
@@ -63,7 +63,7 @@ _DEFUN (_fgetpos64_r, (ptr, fp, pos),
 
 int
 _DEFUN (fgetpos64, (fp, pos),
-	FILE * fp _AND
+	FILE * fp,
 	_fpos64_t * pos)
 {
   return _fgetpos64_r (_REENT, fp, pos);
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
index 60ac73f..7edb5d8 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -65,8 +65,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 FILE *
 _DEFUN (_fopen64_r, (ptr, file, mode),
-	struct _reent *ptr _AND
-	_CONST char *file _AND
+	struct _reent *ptr,
+	_CONST char *file,
 	_CONST char *mode)
 {
   register FILE *fp;
@@ -118,7 +118,7 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
 
 FILE *
 _DEFUN (fopen64, (file, mode),
-	_CONST char *file _AND
+	_CONST char *file,
 	_CONST char *mode)
 {
   return _fopen64_r (_REENT, file, mode);
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index 379462c..6e42d0e 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -76,9 +76,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 FILE *
 _DEFUN (_freopen64_r, (ptr, file, mode, fp),
-	struct _reent *ptr _AND
-	_CONST char *file _AND
-	_CONST char *mode _AND
+	struct _reent *ptr,
+	_CONST char *file,
+	_CONST char *mode,
 	register FILE *fp)
 {
   register int f;
@@ -248,8 +248,8 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
 
 FILE *
 _DEFUN (freopen64, (file, mode, fp),
-	_CONST char *file _AND
-	_CONST char *mode _AND
+	_CONST char *file,
+	_CONST char *mode,
 	register FILE *fp)
 {
   return _freopen64_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
index 624e912..8cd11fa 100644
--- a/newlib/libc/stdio64/fseeko64.c
+++ b/newlib/libc/stdio64/fseeko64.c
@@ -86,9 +86,9 @@ Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
 
 _off64_t
 _DEFUN (_fseeko64_r, (ptr, fp, offset, whence),
-     struct _reent *ptr _AND
-     register FILE *fp _AND
-     _off64_t offset _AND
+     struct _reent *ptr,
+     register FILE *fp,
+     _off64_t offset,
      int whence)
 {
   _fpos64_t _EXFNPTR(seekfn, (struct _reent *, void *, _fpos64_t, int));
@@ -343,8 +343,8 @@ dumb:
 
 _off64_t
 _DEFUN (fseeko64, (fp, offset, whence),
-     register FILE *fp _AND
-     _off64_t offset _AND
+     register FILE *fp,
+     _off64_t offset,
      int whence)
 {
   return _fseeko64_r (_REENT, fp, offset, whence);
diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c
index 83d9962..9cfc107 100644
--- a/newlib/libc/stdio64/fsetpos64.c
+++ b/newlib/libc/stdio64/fsetpos64.c
@@ -42,8 +42,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 int
 _DEFUN (_fsetpos64_r, (ptr, iop, pos),
-	struct _reent *ptr _AND
-	FILE * iop _AND
+	struct _reent *ptr,
+	FILE * iop,
 	_CONST _fpos64_t * pos)
 {
   int x = _fseeko64_r (ptr, iop, (_off64_t)(*pos), SEEK_SET);
@@ -57,7 +57,7 @@ _DEFUN (_fsetpos64_r, (ptr, iop, pos),
 
 int
 _DEFUN (fsetpos64, (iop, pos),
-	FILE * iop _AND
+	FILE * iop,
 	_CONST _fpos64_t * pos)
 {
   return _fsetpos64_r (_REENT, iop, pos);
diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c
index 2441d4c..9a7e7ed 100644
--- a/newlib/libc/stdio64/ftello64.c
+++ b/newlib/libc/stdio64/ftello64.c
@@ -77,7 +77,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 _off64_t
 _DEFUN (_ftello64_r, (ptr, fp),
-	struct _reent *ptr _AND
+	struct _reent *ptr,
 	register FILE * fp)
 {
   _fpos64_t pos;
diff --git a/newlib/libc/stdio64/stdio64.c b/newlib/libc/stdio64/stdio64.c
index dd3b4ad..813b919 100644
--- a/newlib/libc/stdio64/stdio64.c
+++ b/newlib/libc/stdio64/stdio64.c
@@ -27,9 +27,9 @@
 #ifdef __LARGE64_FILES
 _fpos64_t
 _DEFUN(__sseek64, (ptr, cookie, offset, whence),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       _fpos64_t offset _AND
+       struct _reent *ptr,
+       void *cookie,
+       _fpos64_t offset,
        int whence)
 {
   register FILE *fp = (FILE *) cookie;
@@ -48,9 +48,9 @@ _DEFUN(__sseek64, (ptr, cookie, offset, whence),
 
 _READ_WRITE_RETURN_TYPE
 _DEFUN(__swrite64, (ptr, cookie, buf, n),
-       struct _reent *ptr _AND
-       void *cookie _AND
-       char const *buf _AND
+       struct _reent *ptr,
+       void *cookie,
+       char const *buf,
        _READ_WRITE_BUFSIZE_TYPE n)
 {
   register FILE *fp = (FILE *) cookie;