ansification: remove _AND

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

7 files changed, 70 insertions, 70 deletions

diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index a748280..8420cde 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -50,7 +50,7 @@ _DEFUN_VOID(test_atoff)
 static
 void 
 _DEFUN(iterate,(func, name),
-       void _EXFUN((*func),(void)) _AND
+       void _EXFUN((*func),(void)),
        char *name)
 {
 
@@ -71,7 +71,7 @@ int_type *p = ints;
 
 static void
 _DEFUN(int_iterate,(func, name),
-       void (*func)() _AND
+       void (*func)(),
        char *name)
 {
   newfunc(name);
@@ -87,8 +87,8 @@ _DEFUN(int_iterate,(func, name),
 
 void
 _DEFUN(test_strtol_base,(base, pi, string),
-       int base _AND
-       int_scan_type *pi _AND
+       int base,
+       int_scan_type *pi,
        char *string)
 {
   long r;
@@ -207,7 +207,7 @@ _DEFUN_VOID(test_fcvt)
 static void
 
 _DEFUN(diterate,(func, name),
-       void (*func)() _AND
+       void (*func)(),
        char *name)
 {
   newfunc(name);
diff --git a/newlib/libm/test/dcvt.c b/newlib/libm/test/dcvt.c
index 2aaa1af..922652e 100644
--- a/newlib/libm/test/dcvt.c
+++ b/newlib/libm/test/dcvt.c
@@ -40,8 +40,8 @@ double *value)
 
 static char *
 _DEFUN(print_nan,(buffer, value, precision),
-       char *buffer _AND
-       double value _AND
+       char *buffer,
+       double value,
        int precision)
 {
   size_t  i;
@@ -134,7 +134,7 @@ _DEFUN(renormalize,(in),
 
 static void 
 _DEFUN(normalize,(value, in),
-       double value _AND
+       double value,
        cvt_info_type *in)
 {
   int j;
@@ -196,9 +196,9 @@ _DEFUN(normalize,(value, in),
 }
 int
 _DEFUN(round,(in, start, now, ch),
-       cvt_info_type *in _AND
-       char *start _AND
-       char *now _AND
+       cvt_info_type *in,
+       char *start,
+       char *now,
        char ch)
 {
   double rounder = 5.0;
@@ -435,11 +435,11 @@ _DEFUN(_cvtf,(in),
 
 char *
 _DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
-       char *buffer _AND
-       double invalue _AND
-       int precision _AND
-       int width _AND
-       char type _AND
+       char *buffer,
+       double invalue,
+       int precision,
+       int width,
+       char type,
        int dot)
 {
   cvt_info_type in;
@@ -534,10 +534,10 @@ _DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
 
 char *
 _DEFUN(fcvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
-       double invalue _AND 
-       int ndigit _AND
-       int *decpt _AND
-       int *sign _AND
+       double invalue,
+       int ndigit,
+       int *decpt,
+       int *sign,
        char *fcvt_buf)
 {
   cvt_info_type in;
@@ -564,10 +564,10 @@ _DEFUN(fcvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
 
 char *
 _DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
-       double invalue _AND 
-       int ndigit _AND
-       int *decpt _AND
-       int *sign _AND
+       double invalue,
+       int ndigit,
+       int *decpt,
+       int *sign,
        char *fcvt_buf)
 {
   cvt_info_type in;
@@ -597,8 +597,8 @@ _DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
 
 char *
 _DEFUN(gcvt,(d,ndigit,buf),
-   double d _AND
-   int ndigit _AND
+   double d,
+   int ndigit,
    char *buf)
 {
   return _dcvt(buf, d, ndigit, 0, 'g', 1);
diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c
index df63c2d..50b2222 100644
--- a/newlib/libm/test/math.c
+++ b/newlib/libm/test/math.c
@@ -51,7 +51,7 @@ _DEFUN(matherr,(e),
 
 
 void _DEFUN(translate_to,(file,r),
-	    FILE *file _AND
+	    FILE *file,
 	    double r)
 {
   __ieee_double_shape_type bits;
@@ -61,10 +61,10 @@ void _DEFUN(translate_to,(file,r),
 
 int 
 _DEFUN(ffcheck,( is, p, name, serrno, merror),
-       double is _AND
-       one_line_type *p _AND
-       char *name _AND
-       int serrno _AND
+       double is,
+       one_line_type *p,
+       char *name,
+       int serrno,
        int merror)
 {
   /* Make sure the answer isn't to far wrong from the correct value */
@@ -109,7 +109,7 @@ _DEFUN(ffcheck,( is, p, name, serrno, merror),
 
 double
 _DEFUN(thedouble, (msw, lsw),
-       long msw _AND
+       long msw,
        long lsw)
 {
   __ieee_double_shape_type x;
@@ -124,13 +124,13 @@ int reduce;
 
 
 _DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
-       FILE *f _AND
-       int mag _AND
-       one_line_type *p _AND
-       double result _AND
-       int merror _AND
-       int errno _AND
-       char *args _AND
+       FILE *f,
+       int mag,
+       one_line_type *p,
+       double result,
+       int merror,
+       int errno,
+       char *args,
        char *name)
 {
   if (reduce && p->error_bit < mag) 
@@ -177,11 +177,11 @@ _DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
 }
 
 _DEFUN(finish,(f, vector,  result , p, args, name),
-       FILE *f _AND
-       int vector _AND
-       double result _AND
-       one_line_type *p _AND
-       char *args _AND
+       FILE *f,
+       int vector,
+       double result,
+       one_line_type *p,
+       char *args,
        char *name)
 {
   int mag;
@@ -195,10 +195,10 @@ _DEFUN(finish,(f, vector,  result , p, args, name),
 int redo;  
 
 _DEFUN(run_vector_1,(vector, p, func, name, args),
-       int vector _AND
-       one_line_type *p _AND
-       char *func _AND
-       char *name _AND
+       int vector,
+       one_line_type *p,
+       char *func,
+       char *name,
        char *args)
 {
   FILE *f;
diff --git a/newlib/libm/test/string.c b/newlib/libm/test/string.c
index c470472..e97dfcc 100644
--- a/newlib/libm/test/string.c
+++ b/newlib/libm/test/string.c
@@ -11,7 +11,7 @@ int  errors = 0;
 
 void
 _DEFUN(checkit,(ok,l),
-       int ok _AND
+       int ok,
        int l )
 
 {
@@ -32,8 +32,8 @@ _DEFUN(checkit,(ok,l),
 
 void
 _DEFUN(funcqual,(a,b,l),
-       char *a _AND
-       char *b _AND
+       char *a,
+       char *b,
        int l)
 {
   newfunc(it);
@@ -145,7 +145,7 @@ void test_string()
   equal(one, "abcd");	/* Zero count. */
 
   (void) strncat(one, "gh", 2);
-  equal(one, "abcdgh");	/* Count _AND length equal. */
+  equal(one, "abcdgh");	/* Count, length equal. */
   it = "strncmp";
   /* strncmp - first test as strcmp with big counts";*/
   check(strncmp("", "", 99) == 0); /* Trivial case. */
@@ -494,7 +494,7 @@ void test_string()
 
   (void) memset(one+5, 0, 1);
   equal(one, "axxxe");	/* Zero fill. */
-  equal(one+6, "gh");	/* _AND the leftover. */
+  equal(one+6, "gh");	/*, the leftover. */
 
   (void) memset(one+2, 010045, 1);
   equal(one, "ax\045xe");	/* Unsigned char convert. */
diff --git a/newlib/libm/test/test.c b/newlib/libm/test/test.c
index 615c54a..b25e4b9 100644
--- a/newlib/libm/test/test.c
+++ b/newlib/libm/test/test.c
@@ -10,7 +10,7 @@ int inacc;
 
 int
 _DEFUN(main,(ac, av),
-       int ac _AND
+       int ac,
        char **av)
 {
   int i;
@@ -93,7 +93,7 @@ int strtod_vector = 0;
 
 int 
 _DEFUN(bigger,(a,b),
-	   __ieee_double_shape_type *a  _AND
+	   __ieee_double_shape_type *a,
 	   __ieee_double_shape_type *b)
 {
 
@@ -117,7 +117,7 @@ _DEFUN(bigger,(a,b),
 /* Return the first bit different between two double numbers */
 int 
 _DEFUN(mag_of_error,(is, shouldbe),
-       double is _AND
+       double is,
        double shouldbe)
 {
   __ieee_double_shape_type a,b;
@@ -184,7 +184,7 @@ _DEFUN(mag_of_error,(is, shouldbe),
 
 void
 _DEFUN(test_sok,(is, shouldbe),
-       char *is _AND
+       char *is,
        char *shouldbe)
 {
   if (strcmp(is,shouldbe))
@@ -198,7 +198,7 @@ _DEFUN(test_sok,(is, shouldbe),
 }
 void
 _DEFUN(test_iok,(is, shouldbe),
-       int is _AND
+       int is,
        int shouldbe)
 {
   if (is != shouldbe){
@@ -216,8 +216,8 @@ _DEFUN(test_iok,(is, shouldbe),
 */
 void 
 _DEFUN(test_scok,(is, shouldbe, count),
-       char *is _AND
-       char *shouldbe _AND
+       char *is,
+       char *shouldbe,
        int count)
 {
   if (strncmp(is,shouldbe, count))
@@ -232,7 +232,7 @@ _DEFUN(test_scok,(is, shouldbe, count),
 
 void
 _DEFUN(test_eok,(is, shouldbe),
-       int is _AND
+       int is,
        int shouldbe)
 {
   if (is != shouldbe){
@@ -246,8 +246,8 @@ _DEFUN(test_eok,(is, shouldbe),
 
 void
 _DEFUN(test_mok,(value, shouldbe, okmag),
-       double value _AND
-       double shouldbe _AND
+       double value,
+       double shouldbe,
        int okmag)
 {
   __ieee_double_shape_type a,b;
diff --git a/newlib/libm/test/test_ieee.c b/newlib/libm/test/test_ieee.c
index a126d01..07c4941 100644
--- a/newlib/libm/test/test_ieee.c
+++ b/newlib/libm/test/test_ieee.c
@@ -83,7 +83,7 @@ _DEFUN_VOID(test_getroundtoi)
 
 double
  _DEFUN(dnumber,(msw, lsw),
-	int msw _AND
+	int msw,
 	int lsw)
 {
   
diff --git a/newlib/libm/test/test_is.c b/newlib/libm/test/test_is.c
index 2e99bec..39c15c1 100644
--- a/newlib/libm/test/test_is.c
+++ b/newlib/libm/test/test_is.c
@@ -1934,8 +1934,8 @@ int _DEFUN(def__toupper,(i), int i) { return _toupper(i); }
 extern int inacc;
 void
 _DEFUN(test_is_set,(func, name, p),
-       int (*func)() _AND
-       char *name _AND
+       int (*func)(),
+       char *name,
        int *p)
 {
   int i;
@@ -1953,10 +1953,10 @@ _DEFUN(test_is_set,(func, name, p),
 }
 void
 _DEFUN(test_to_set,(func, name, p, low, high),
-       int (*func)() _AND
-       char *name _AND
-       int *p _AND
-       int low _AND
+       int (*func)(),
+       char *name,
+       int *p,
+       int low,
        int high)
 {
   int i;