ansification: remove _AND

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

19 files changed, 42 insertions, 42 deletions

diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index 559ca03..cb78fba 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -46,9 +46,9 @@ DESCRIPTION
 
 int
 _DEFUN (_execve_r, (ptr, name, argv, env),
-     struct _reent *ptr _AND
-     _CONST char *name _AND
-     char *_CONST argv[] _AND
+     struct _reent *ptr,
+     _CONST char *name,
+     char *_CONST argv[],
      char *_CONST env[])
 {
   int ret;
@@ -114,7 +114,7 @@ DESCRIPTION
 
 int
 _DEFUN (_wait_r, (ptr, status),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      int *status)
 {
   int ret;
diff --git a/newlib/libc/reent/fcntlr.c b/newlib/libc/reent/fcntlr.c
index 328b9de..fdfe410 100644
--- a/newlib/libc/reent/fcntlr.c
+++ b/newlib/libc/reent/fcntlr.c
@@ -41,9 +41,9 @@ DESCRIPTION
 
 int
 _DEFUN (_fcntl_r, (ptr, fd, cmd, arg),
-     struct _reent *ptr _AND
-     int fd _AND
-     int cmd _AND
+     struct _reent *ptr,
+     int fd,
+     int cmd,
      int arg)
 {
   int ret;
diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c
index d9fa8b7..06a89a5 100644
--- a/newlib/libc/reent/fstat64r.c
+++ b/newlib/libc/reent/fstat64r.c
@@ -48,8 +48,8 @@ DESCRIPTION
 
 int
 _DEFUN (_fstat64_r, (ptr, fd, pstat),
-     struct _reent *ptr _AND
-     int fd _AND
+     struct _reent *ptr,
+     int fd,
      struct stat64 *pstat)
 {
   int ret;
diff --git a/newlib/libc/reent/gettimeofdayr.c b/newlib/libc/reent/gettimeofdayr.c
index 007dff8..80942af 100644
--- a/newlib/libc/reent/gettimeofdayr.c
+++ b/newlib/libc/reent/gettimeofdayr.c
@@ -53,8 +53,8 @@ DESCRIPTION
 
 int
 _DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
-     struct _reent *ptr _AND
-     struct timeval *ptimeval _AND
+     struct _reent *ptr,
+     struct timeval *ptimeval,
      void *ptimezone)
 {
   int ret;
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index 8cfdf2f..59113d2 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -44,8 +44,8 @@ DESCRIPTION
 
 int
 _DEFUN (_link_r, (ptr, old, new),
-     struct _reent *ptr _AND
-     _CONST char *old _AND
+     struct _reent *ptr,
+     _CONST char *old,
      _CONST char *new)
 {
   int ret;
diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c
index 1241a27..2f16f0b 100644
--- a/newlib/libc/reent/lseek64r.c
+++ b/newlib/libc/reent/lseek64r.c
@@ -42,9 +42,9 @@ DESCRIPTION
 
 _off64_t
 _DEFUN (_lseek64_r, (ptr, fd, pos, whence),
-     struct _reent *ptr _AND
-     int fd _AND
-     _off64_t pos _AND
+     struct _reent *ptr,
+     int fd,
+     _off64_t pos,
      int whence)
 {
   _off64_t ret;
diff --git a/newlib/libc/reent/lseekr.c b/newlib/libc/reent/lseekr.c
index cc73ab4..6391589 100644
--- a/newlib/libc/reent/lseekr.c
+++ b/newlib/libc/reent/lseekr.c
@@ -39,9 +39,9 @@ DESCRIPTION
 
 _off_t
 _DEFUN (_lseek_r, (ptr, fd, pos, whence),
-     struct _reent *ptr _AND
-     int fd _AND
-     _off_t pos _AND
+     struct _reent *ptr,
+     int fd,
+     _off_t pos,
      int whence)
 {
   _off_t ret;
diff --git a/newlib/libc/reent/mkdirr.c b/newlib/libc/reent/mkdirr.c
index eee999e..4c2c94f 100644
--- a/newlib/libc/reent/mkdirr.c
+++ b/newlib/libc/reent/mkdirr.c
@@ -41,8 +41,8 @@ DESCRIPTION
 
 int
 _DEFUN (_mkdir_r, (ptr, path, mode),
-     struct _reent *ptr _AND
-     _CONST char *path _AND
+     struct _reent *ptr,
+     _CONST char *path,
      int mode)
 {
   int ret;
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index 06b203b..f38ff84 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -40,9 +40,9 @@ DESCRIPTION
 
 int
 _DEFUN (_open_r, (ptr, file, flags, mode),
-     struct _reent *ptr _AND
-     _CONST char *file _AND
-     int flags _AND
+     struct _reent *ptr,
+     _CONST char *file,
+     int flags,
      int mode)
 {
   int ret;
diff --git a/newlib/libc/reent/readr.c b/newlib/libc/reent/readr.c
index 65e0514..edc6fd0 100644
--- a/newlib/libc/reent/readr.c
+++ b/newlib/libc/reent/readr.c
@@ -39,9 +39,9 @@ DESCRIPTION
 
 _ssize_t
 _DEFUN (_read_r, (ptr, fd, buf, cnt),
-     struct _reent *ptr _AND
-     int fd _AND
-     _PTR buf _AND
+     struct _reent *ptr,
+     int fd,
+     _PTR buf,
      size_t cnt)
 {
   _ssize_t ret;
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index b6c2abf..a98c311 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -31,7 +31,7 @@ int errno;
 
 void
 _DEFUN (cleanup_glue, (ptr, glue),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      struct _glue *glue)
 {
   /* Have to reclaim these in reverse order: */
diff --git a/newlib/libc/reent/renamer.c b/newlib/libc/reent/renamer.c
index 9b42dc3..e55c2f2 100644
--- a/newlib/libc/reent/renamer.c
+++ b/newlib/libc/reent/renamer.c
@@ -41,8 +41,8 @@ DESCRIPTION
 
 int
 _DEFUN (_rename_r, (ptr, old, new),
-     struct _reent *ptr _AND
-     _CONST char *old _AND
+     struct _reent *ptr,
+     _CONST char *old,
      _CONST char *new)
 {
   int ret = 0;
diff --git a/newlib/libc/reent/sbrkr.c b/newlib/libc/reent/sbrkr.c
index 4217174..0bc4163 100644
--- a/newlib/libc/reent/sbrkr.c
+++ b/newlib/libc/reent/sbrkr.c
@@ -42,7 +42,7 @@ DESCRIPTION
 
 void *
 _DEFUN (_sbrk_r, (ptr, incr),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      ptrdiff_t incr)
 {
   char *ret;
diff --git a/newlib/libc/reent/signalr.c b/newlib/libc/reent/signalr.c
index 95dd49e..9229061 100644
--- a/newlib/libc/reent/signalr.c
+++ b/newlib/libc/reent/signalr.c
@@ -44,8 +44,8 @@ DESCRIPTION
 
 int
 _DEFUN (_kill_r, (ptr, pid, sig),
-     struct _reent *ptr _AND
-     int pid _AND
+     struct _reent *ptr,
+     int pid,
      int sig)
 {
   int ret;
diff --git a/newlib/libc/reent/stat64r.c b/newlib/libc/reent/stat64r.c
index 1f175e0..134ca82 100644
--- a/newlib/libc/reent/stat64r.c
+++ b/newlib/libc/reent/stat64r.c
@@ -46,8 +46,8 @@ DESCRIPTION
 
 int
 _DEFUN (_stat64_r, (ptr, file, pstat),
-     struct _reent *ptr _AND
-     _CONST char *file _AND
+     struct _reent *ptr,
+     _CONST char *file,
      struct stat64 *pstat)
 {
   int ret;
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index 3500c88..2b271e1 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -46,8 +46,8 @@ DESCRIPTION
 
 int
 _DEFUN (_stat_r, (ptr, file, pstat),
-     struct _reent *ptr _AND
-     _CONST char *file _AND
+     struct _reent *ptr,
+     _CONST char *file,
      struct stat *pstat)
 {
   int ret;
diff --git a/newlib/libc/reent/timesr.c b/newlib/libc/reent/timesr.c
index efb98b6..dbe6a4e 100644
--- a/newlib/libc/reent/timesr.c
+++ b/newlib/libc/reent/timesr.c
@@ -45,7 +45,7 @@ DESCRIPTION
 
 clock_t
 _DEFUN (_times_r, (ptr, ptms),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      struct tms *ptms)
 {
   clock_t ret;
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index 53b8f11..eb000be 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -39,7 +39,7 @@ DESCRIPTION
 
 int
 _DEFUN (_unlink_r, (ptr, file),
-     struct _reent *ptr _AND
+     struct _reent *ptr,
      _CONST char *file)
 {
   int ret;
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 4190a90..4e06d74 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -39,9 +39,9 @@ DESCRIPTION
 
 _ssize_t
 _DEFUN (_write_r, (ptr, fd, buf, cnt),
-     struct _reent *ptr _AND
-     int fd _AND
-     _CONST _PTR buf _AND
+     struct _reent *ptr,
+     int fd,
+     _CONST _PTR buf,
      size_t cnt)
 {
   _ssize_t ret;