ansification: remove _AND

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

13 files changed, 54 insertions, 54 deletions

diff --git a/newlib/libc/posix/creat.c b/newlib/libc/posix/creat.c
index b8a4f9a14..116f26ce3 100644
--- a/newlib/libc/posix/creat.c
+++ b/newlib/libc/posix/creat.c
@@ -6,7 +6,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/posix/execl.c b/newlib/libc/posix/execl.c
index ebb97fb9b..beb48c6ae 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -19,7 +19,7 @@ static char ***p_environ = &environ;
 
 int
 _DEFUN(execl, (path, arg0, ...), 
-      _CONST char *path _AND
+      _CONST char *path,
       _CONST char *arg0 _DOTS)
 
 #else
@@ -28,8 +28,8 @@ _DEFUN(execl, (path, arg0, ...),
 
 int
 _DEFUN(execl, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
+     _CONST char *path,
+     _CONST char *arg0,
      va_dcl)
 
 #endif
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index 2b22036a1..f4c759250 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -14,7 +14,7 @@
 
 int
 _DEFUN(execle, (path, arg0, ...),
-      _CONST char *path _AND
+      _CONST char *path,
       _CONST char *arg0 _DOTS)
 
 #else
@@ -23,8 +23,8 @@ _DEFUN(execle, (path, arg0, ...),
 
 int
 _DEFUN(execle, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
+     _CONST char *path,
+     _CONST char *arg0,
      va_dcl)
 
 #endif
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index 6212da629..6731bb905 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -14,7 +14,7 @@
 
 int
 _DEFUN(execlp, (path, arg0, ...),
-      _CONST char *path _AND
+      _CONST char *path,
       _CONST char *arg0 _DOTS)
 
 #else
@@ -23,8 +23,8 @@ _DEFUN(execlp, (path, arg0, ...),
 
 int
 _DEFUN(execlp, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
+     _CONST char *path,
+     _CONST char *arg0,
      va_dcl)
 
 #endif
diff --git a/newlib/libc/posix/execv.c b/newlib/libc/posix/execv.c
index 8793e2ec4..049a5381d 100644
--- a/newlib/libc/posix/execv.c
+++ b/newlib/libc/posix/execv.c
@@ -15,7 +15,7 @@ static char ***p_environ = &environ;
 
 int
 _DEFUN (execv, (path, argv), 
-	const char *path _AND
+	const char *path,
 	char * const argv[])
 {
   return _execve (path, (char * _CONST *) argv, *p_environ);
diff --git a/newlib/libc/posix/execve.c b/newlib/libc/posix/execve.c
index d1355133a..c2a2144f5 100644
--- a/newlib/libc/posix/execve.c
+++ b/newlib/libc/posix/execve.c
@@ -11,8 +11,8 @@
 
 int
 _DEFUN(execve, (path, argv, envp),
-      const char *path _AND
-      char * const argv[] _AND
+      const char *path,
+      char * const argv[],
       char * const envp[])
 {
   return _execve (path, argv, envp);
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c
index 64310f661..db7e03456 100644
--- a/newlib/libc/posix/execvp.c
+++ b/newlib/libc/posix/execvp.c
@@ -22,8 +22,8 @@
 
 static char *
 _DEFUN (strccpy, (s1, s2, c),
-	char *s1 _AND
-	char *s2 _AND
+	char *s1,
+	char *s2,
 	char c)
 {
   char *dest = s1;
@@ -37,7 +37,7 @@ _DEFUN (strccpy, (s1, s2, c),
 
 int
 _DEFUN (execvp, (file, argv),
-	_CONST char *file _AND
+	_CONST char *file,
 	char * _CONST argv[])
 {
   char *path = getenv ("PATH");
diff --git a/newlib/libc/posix/popen.c b/newlib/libc/posix/popen.c
index f9abfac3f..bbd0fc424 100644
--- a/newlib/libc/posix/popen.c
+++ b/newlib/libc/posix/popen.c
@@ -110,7 +110,7 @@ static struct pid {
 
 FILE *
 _DEFUN(popen, (program, type),
-	const char *program _AND
+	const char *program,
 	const char *type)
 {
 	struct pid *cur;
diff --git a/newlib/libc/posix/posix_spawn.c b/newlib/libc/posix/posix_spawn.c
index 61d36304d..8e54de7fa 100644
--- a/newlib/libc/posix/posix_spawn.c
+++ b/newlib/libc/posix/posix_spawn.c
@@ -295,11 +295,11 @@ do_posix_spawn(pid_t *pid, _CONST char *path,
 
 int
 _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
-	pid_t *pid _AND
-	_CONST char *path _AND
-	_CONST posix_spawn_file_actions_t *fa _AND
-	_CONST posix_spawnattr_t *sa _AND
-	char * _CONST argv[] _AND
+	pid_t *pid,
+	_CONST char *path,
+	_CONST posix_spawn_file_actions_t *fa,
+	_CONST posix_spawnattr_t *sa,
+	char * _CONST argv[],
 	char * _CONST envp[])
 {
 	return do_posix_spawn(pid, path, fa, sa, argv, envp, 0);
@@ -307,11 +307,11 @@ _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
 
 int
 _DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
-	pid_t *pid _AND
-	_CONST char *path _AND
-	_CONST posix_spawn_file_actions_t *fa _AND
-	_CONST posix_spawnattr_t *sa _AND
-	char * _CONST argv[] _AND
+	pid_t *pid,
+	_CONST char *path,
+	_CONST posix_spawn_file_actions_t *fa,
+	_CONST posix_spawnattr_t *sa,
+	char * _CONST argv[],
 	char * _CONST envp[])
 {
 	return do_posix_spawn(pid, path, fa, sa, argv, envp, 1);
@@ -358,10 +358,10 @@ _DEFUN(posix_spawn_file_actions_destroy, (fa),
 
 int
 _DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
-	posix_spawn_file_actions_t * __restrict fa _AND
-	int fildes _AND
-	_CONST char * __restrict path _AND
-	int oflag _AND
+	posix_spawn_file_actions_t * __restrict fa,
+	int fildes,
+	_CONST char * __restrict path,
+	int oflag,
 	mode_t mode)
 {
 	posix_spawn_file_actions_entry_t *fae;
@@ -393,8 +393,8 @@ _DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
 
 int
 _DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
-	posix_spawn_file_actions_t *fa _AND
-	int fildes _AND
+	posix_spawn_file_actions_t *fa,
+	int fildes,
 	int newfildes)
 {
 	posix_spawn_file_actions_entry_t *fae;
@@ -418,7 +418,7 @@ _DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
 
 int
 _DEFUN(posix_spawn_file_actions_addclose, (fa, fildes),
-	posix_spawn_file_actions_t *fa _AND
+	posix_spawn_file_actions_t *fa,
 	int fildes)
 {
 	posix_spawn_file_actions_entry_t *fae;
@@ -468,7 +468,7 @@ _DEFUN(posix_spawnattr_destroy, (sa),
 
 int
 _DEFUN(posix_spawnattr_getflags, (sa, flags),
-	_CONST posix_spawnattr_t * __restrict sa _AND
+	_CONST posix_spawnattr_t * __restrict sa,
 	short * __restrict flags)
 {
 	*flags = (*sa)->sa_flags;
@@ -477,7 +477,7 @@ _DEFUN(posix_spawnattr_getflags, (sa, flags),
 
 int
 _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
-	_CONST posix_spawnattr_t * __restrict sa _AND
+	_CONST posix_spawnattr_t * __restrict sa,
 	pid_t * __restrict pgroup)
 {
 	*pgroup = (*sa)->sa_pgroup;
@@ -486,7 +486,7 @@ _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
 
 int
 _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
-	_CONST posix_spawnattr_t * __restrict sa _AND
+	_CONST posix_spawnattr_t * __restrict sa,
 	struct sched_param * __restrict schedparam)
 {
 	*schedparam = (*sa)->sa_schedparam;
@@ -495,7 +495,7 @@ _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
 
 int
 _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
-	_CONST posix_spawnattr_t * __restrict sa _AND
+	_CONST posix_spawnattr_t * __restrict sa,
 	int * __restrict schedpolicy)
 {
 	*schedpolicy = (*sa)->sa_schedpolicy;
@@ -504,7 +504,7 @@ _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
 
 int
 _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
-	_CONST posix_spawnattr_t * __restrict sa _AND
+	_CONST posix_spawnattr_t * __restrict sa,
 	sigset_t * __restrict sigdefault)
 {
 	*sigdefault = (*sa)->sa_sigdefault;
@@ -513,7 +513,7 @@ _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
 
 int
 _DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
-	_CONST posix_spawnattr_t * __restrict sa _AND
+	_CONST posix_spawnattr_t * __restrict sa,
 	sigset_t * __restrict sigmask)
 {
 	*sigmask = (*sa)->sa_sigmask;
@@ -522,7 +522,7 @@ _DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
 
 int
 _DEFUN(posix_spawnattr_setflags, (sa, flags),
-	posix_spawnattr_t *sa _AND
+	posix_spawnattr_t *sa,
 	short flags)
 {
 	(*sa)->sa_flags = flags;
@@ -531,7 +531,7 @@ _DEFUN(posix_spawnattr_setflags, (sa, flags),
 
 int
 _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
-	posix_spawnattr_t *sa _AND
+	posix_spawnattr_t *sa,
 	pid_t pgroup)
 {
 	(*sa)->sa_pgroup = pgroup;
@@ -540,7 +540,7 @@ _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
 
 int
 _DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
-	posix_spawnattr_t * __restrict sa _AND
+	posix_spawnattr_t * __restrict sa,
 	_CONST struct sched_param * __restrict schedparam)
 {
 	(*sa)->sa_schedparam = *schedparam;
@@ -549,7 +549,7 @@ _DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
 
 int
 _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
-	posix_spawnattr_t *sa _AND
+	posix_spawnattr_t *sa,
 	int schedpolicy)
 {
 	(*sa)->sa_schedpolicy = schedpolicy;
@@ -558,7 +558,7 @@ _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
 
 int
 _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
-	posix_spawnattr_t * __restrict sa _AND
+	posix_spawnattr_t * __restrict sa,
 	_CONST sigset_t * __restrict sigdefault)
 {
 	(*sa)->sa_sigdefault = *sigdefault;
@@ -567,7 +567,7 @@ _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
 
 int
 _DEFUN(posix_spawnattr_setsigmask, (sa, sigmask),
-	posix_spawnattr_t * __restrict sa _AND
+	posix_spawnattr_t * __restrict sa,
 	_CONST sigset_t * __restrict sigmask)
 {
 	(*sa)->sa_sigmask = *sigmask;
diff --git a/newlib/libc/posix/readdir_r.c b/newlib/libc/posix/readdir_r.c
index d13775b87..a75eee9a3 100644
--- a/newlib/libc/posix/readdir_r.c
+++ b/newlib/libc/posix/readdir_r.c
@@ -51,8 +51,8 @@ extern int getdents (int fd, void *dp, int count);
  */
 int
 _DEFUN(readdir_r, (dirp, dp, dpp),
-	register DIR *__restrict dirp _AND
-	struct dirent *__restrict dp _AND
+	register DIR *__restrict dirp,
+	struct dirent *__restrict dp,
 	struct dirent **__restrict dpp) {
 
 struct dirent *tmpdp;
diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c
index 8cb8ff82d..0ffe68971 100644
--- a/newlib/libc/posix/scandir.c
+++ b/newlib/libc/posix/scandir.c
@@ -69,9 +69,9 @@ static char sccsid[] = "@(#)scandir.c	5.10 (Berkeley) 2/23/91";
 
 int
 _DEFUN(scandir, (dirname, namelist, select, dcomp),
-	const char *dirname _AND
-	struct dirent ***namelist _AND
-	int (*select) __P((const struct dirent *)) _AND
+	const char *dirname,
+	struct dirent ***namelist,
+	int (*select) __P((const struct dirent *)),
 	int (*dcomp) __P((const struct dirent **, const struct dirent **)))
 {
 	register struct dirent *d, *p, **names;
@@ -170,7 +170,7 @@ cleanup:
  */
 int
 _DEFUN(alphasort, (d1, d2),
-       const struct dirent **d1 _AND
+       const struct dirent **d1,
        const struct dirent **d2)
 {
        return(strcmp((*d1)->d_name, (*d2)->d_name));
diff --git a/newlib/libc/posix/seekdir.c b/newlib/libc/posix/seekdir.c
index 3965edabf..f876d7075 100644
--- a/newlib/libc/posix/seekdir.c
+++ b/newlib/libc/posix/seekdir.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)seekdir.c	5.7 (Berkeley) 6/1/90";
  */
 void
 _DEFUN(seekdir, (dirp, loc),
-	DIR *dirp _AND
+	DIR *dirp,
 	long loc)
 {
 #ifdef HAVE_DD_LOCK
diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c
index 959e3b7bb..9c945fcf7 100644
--- a/newlib/libc/posix/telldir.c
+++ b/newlib/libc/posix/telldir.c
@@ -120,7 +120,7 @@ _DEFUN(telldir, (dirp),
  */
 void
 _DEFUN(_seekdir, (dirp, loc),
-	register DIR *dirp _AND
+	register DIR *dirp,
 	long loc)
 {
 	register struct ddloc *lp;