ansification: remove _AND

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

15 files changed, 142 insertions, 142 deletions

diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index 749269766..62bab771e 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -102,7 +102,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
 #if defined (ICONV_FROM_UCS_CES_EUC)
 static _VOID_PTR
 _DEFUN(euc_from_ucs_init, (rptr, encoding),
-                          struct _reent *rptr _AND
+                          struct _reent *rptr,
                           _CONST char *encoding)
 {
   int i;
@@ -166,7 +166,7 @@ error1:
 
 static size_t
 _DEFUN(euc_from_ucs_close, (rptr, data),
-                           struct _reent *rptr _AND
+                           struct _reent *rptr,
                            _VOID_PTR data)
 {
   int i;
@@ -186,9 +186,9 @@ _DEFUN(euc_from_ucs_close, (rptr, data),
 
 static size_t
 _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                             _VOID_PTR data         _AND
-                             register ucs4_t in     _AND
-                             unsigned char **outbuf _AND
+                             _VOID_PTR data,
+                             register ucs4_t in,
+                             unsigned char **outbuf,
                              size_t *outbytesleft)
 {
   int i;
@@ -262,7 +262,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_EUC)
 static _VOID_PTR
 _DEFUN(euc_to_ucs_init, (rptr, encoding),
-                        struct _reent *rptr _AND
+                        struct _reent *rptr,
                         _CONST char *encoding)
 {
   int i;
@@ -326,7 +326,7 @@ error1:
 
 static size_t
 _DEFUN(euc_to_ucs_close, (rptr, data),
-                         struct _reent *rptr _AND
+                         struct _reent *rptr,
                          _VOID_PTR data)
 {
   int i;
@@ -346,8 +346,8 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
 
 static ucs4_t
 _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
-                           _VOID_PTR data               _AND
-                           _CONST unsigned char **inbuf _AND
+                           _VOID_PTR data,
+                           _CONST unsigned char **inbuf,
                            size_t *inbytesleft)
 {
   int i;
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index fc46e27f2..650bf9af2 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -41,9 +41,9 @@
 #if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
 static size_t
 _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
+                               _VOID_PTR data,
+                               ucs4_t in,
+                               unsigned char **outbuf,
                                size_t *outbytesleft)
 {
   if (*outbytesleft < 1)
@@ -66,7 +66,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 static _VOID_PTR
 _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
-                                struct _reent *rptr _AND
+                                struct _reent *rptr,
                                 _CONST char *encoding)
 {
   return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
@@ -74,7 +74,7 @@ _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
 
 static size_t
 _DEFUN(table_pcs_from_ucs_close, (rptr, data),
-                                 struct _reent *rptr _AND
+                                 struct _reent *rptr,
                                  _VOID_PTR data)
 {
   return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
@@ -92,8 +92,8 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
 #if defined (ICONV_TO_UCS_CES_TABLE_PCS)
 static ucs4_t
 _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
+                             _VOID_PTR data,
+                             _CONST unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   if (*inbytesleft < 1)
@@ -114,7 +114,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static _VOID_PTR
 _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
-                              struct _reent *rptr _AND
+                              struct _reent *rptr,
                               _CONST char *encoding)
 {
   return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
@@ -122,7 +122,7 @@ _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
 
 static size_t
 _DEFUN(table_pcs_to_ucs_close, (rptr, data),
-                               struct _reent *rptr _AND
+                               struct _reent *rptr,
                                _VOID_PTR data)
 {
   return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index e43e23faa..39c358cda 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -75,7 +75,7 @@ _EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction));
  */
 static size_t
 _DEFUN(table_close, (rptr, data),
-                    struct _reent *rptr _AND
+                    struct _reent *rptr,
                     _VOID_PTR data)
 {
   _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -90,7 +90,7 @@ _DEFUN(table_close, (rptr, data),
 #if defined (ICONV_FROM_UCS_CES_TABLE)
 static _VOID_PTR
 _DEFUN(table_init_from_ucs, (rptr, encoding),
-                            struct _reent *rptr _AND
+                            struct _reent *rptr,
                             _CONST char *encoding)
 {
   int i;
@@ -128,9 +128,9 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
 
 static size_t
 _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
+                               _VOID_PTR data,
+                               ucs4_t in,
+                               unsigned char **outbuf,
                                size_t *outbytesleft)
 {
   _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -173,7 +173,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_TABLE)
 static _VOID_PTR
 _DEFUN(table_init_to_ucs, (rptr, encoding),
-                          struct _reent *rptr _AND
+                          struct _reent *rptr,
                           _CONST char *encoding)
 {
   int i;
@@ -211,8 +211,8 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
 
 static ucs4_t
 _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
+                             _VOID_PTR data,
+                             _CONST unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -304,7 +304,7 @@ _iconv_from_ucs_ces_handlers_table =
  */
 static __inline ucs2_t
 _DEFUN(find_code_speed, (code, tblp),
-                        ucs2_t code _AND
+                        ucs2_t code,
                         _CONST __uint16_t *tblp)
 {
   int idx = tblp[code >> 8];
@@ -327,7 +327,7 @@ _DEFUN(find_code_speed, (code, tblp),
  */
 static __inline ucs2_t
 _DEFUN(find_code_speed_8bit, (code, tblp),
-                             ucs2_t code _AND
+                             ucs2_t code,
                              _CONST unsigned char *tblp)
 {
   int idx;
@@ -367,7 +367,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
  */
 static ucs2_t
 _DEFUN(find_code_size, (code, tblp),
-                       ucs2_t code _AND
+                       ucs2_t code,
                        _CONST __uint16_t *tblp)
 {
   int first, last, cur, center;
@@ -461,8 +461,8 @@ _DEFUN(find_code_size, (code, tblp),
  */
 static _CONST iconv_ccs_desc_t *
 _DEFUN(load_file, (rptr, name, direction), 
-                  struct _reent *rptr _AND
-                  _CONST char *name   _AND
+                  struct _reent *rptr,
+                  _CONST char *name,
                   int direction)
 {
   int fd;
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 893bdd429..2aacce912 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -45,9 +45,9 @@
 #if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
 static size_t
 _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        _VOID_PTR data         _AND
-                                        register ucs4_t in     _AND
-                                        unsigned char **outbuf _AND
+                                        _VOID_PTR data,
+                                        register ucs4_t in,
+                                        unsigned char **outbuf,
                                         size_t *outbytesleft)
 {
   if (in > 0x0000FFFF)
@@ -67,8 +67,8 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
 static ucs4_t
 _DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
-                                      _VOID_PTR data               _AND
-                                      _CONST unsigned char **inbuf _AND
+                                      _VOID_PTR data,
+                                      _CONST unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
   register ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index 6f796ca54..000a7912f 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -51,7 +51,7 @@
 
 static _VOID_PTR
 _DEFUN(ucs_2_init, (rptr, encoding),
-                   struct _reent *rptr _AND
+                   struct _reent *rptr,
                    _CONST char *encoding)
 {
   int *data;
@@ -69,7 +69,7 @@ _DEFUN(ucs_2_init, (rptr, encoding),
 
 static size_t
 _DEFUN(ucs_2_close, (rptr, data),
-                    struct _reent *rptr _AND
+                    struct _reent *rptr,
                     _VOID_PTR data)
 {
   _free_r (rptr, data);
@@ -79,9 +79,9 @@ _DEFUN(ucs_2_close, (rptr, data),
 #if defined (ICONV_FROM_UCS_CES_UCS_2)
 static size_t
 _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
+                               _VOID_PTR data,
+                               ucs4_t in,
+                               unsigned char **outbuf,
                                size_t *outbytesleft)
 {
   if ((in  >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
@@ -106,8 +106,8 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_UCS_2)
 static ucs4_t
 _DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
+                             _VOID_PTR data,
+                             _CONST unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index d8df9b157..4266b2afc 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -45,9 +45,9 @@
 #if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
 static size_t
 _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        _VOID_PTR data         _AND
-                                        register ucs4_t in     _AND
-                                        unsigned char **outbuf _AND
+                                        _VOID_PTR data,
+                                        register ucs4_t in,
+                                        unsigned char **outbuf,
                                         size_t *outbytesleft)
 {
   if (in > 0x7FFFFFFF)
@@ -67,8 +67,8 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
 static ucs4_t
 _DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
-                                      _VOID_PTR data               _AND
-                                      _CONST unsigned char **inbuf _AND
+                                      _VOID_PTR data,
+                                      _CONST unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
   register ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index cfa7b367d..1d028c5dd 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -52,7 +52,7 @@
 
 static _VOID_PTR
 _DEFUN(ucs_4_init, (rptr, encoding),
-                   struct _reent *rptr _AND
+                   struct _reent *rptr,
                    _CONST char *encoding)
 {
   int *data;
@@ -70,7 +70,7 @@ _DEFUN(ucs_4_init, (rptr, encoding),
 
 static size_t
 _DEFUN(ucs_4_close, (rptr, data),
-                    struct _reent *rptr _AND
+                    struct _reent *rptr,
                     _VOID_PTR data)
 {
   _free_r(rptr, data);
@@ -81,9 +81,9 @@ _DEFUN(ucs_4_close, (rptr, data),
 #if defined (ICONV_FROM_UCS_CES_UCS_4)
 static size_t
 _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
+                               _VOID_PTR data,
+                               ucs4_t in,
+                               unsigned char **outbuf,
                                size_t *outbytesleft)
 {
   if ((in  >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
@@ -108,8 +108,8 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_UCS_4)
 static ucs4_t
 _DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
+                             _VOID_PTR data,
+                             _CONST unsigned char **inbuf,
                              size_t *inbytesleft)
 {
   ucs4_t res;
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index 2f213a7ed..eb4dee6e3 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -41,9 +41,9 @@
 #if defined (ICONV_FROM_UCS_CES_US_ASCII)
 static size_t
 _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                  _VOID_PTR data         _AND
-                                  ucs4_t in              _AND
-                                  unsigned char **outbuf _AND
+                                  _VOID_PTR data,
+                                  ucs4_t in,
+                                  unsigned char **outbuf,
                                   size_t *outbytesleft)
 {
   if (in  > 0x7F)
@@ -61,8 +61,8 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_US_ASCII)
 static ucs4_t
 _DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
-                                _VOID_PTR data               _AND
-                                _CONST unsigned char **inbuf _AND
+                                _VOID_PTR data,
+                                _CONST unsigned char **inbuf,
                                 size_t *inbytesleft)
 {
   ucs4_t res;
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index 4b2ff77a1..93cc4c341 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -59,7 +59,7 @@
 
 static size_t
 _DEFUN(utf_16_close, (rptr, data),
-                     struct _reent *rptr _AND
+                     struct _reent *rptr,
                      _VOID_PTR data)
 {
   _free_r(rptr, data);
@@ -69,7 +69,7 @@ _DEFUN(utf_16_close, (rptr, data),
 #if defined (ICONV_FROM_UCS_CES_UTF_16)
 static _VOID_PTR
 _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
-                             struct _reent *rptr _AND
+                             struct _reent *rptr,
                              _CONST char *encoding)
 {
   int *data;
@@ -89,9 +89,9 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
 
 static size_t
 _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                _VOID_PTR data         _AND
-                                register ucs4_t in     _AND
-                                unsigned char **outbuf _AND
+                                _VOID_PTR data,
+                                register ucs4_t in,
+                                unsigned char **outbuf,
                                 size_t *outbytesleft)
 {
   register ucs2_t *cp;
@@ -171,7 +171,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_UTF_16)
 static _VOID_PTR
 _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
-                           struct _reent *rptr _AND
+                           struct _reent *rptr,
                            _CONST char *encoding)
 {
   int *data;
@@ -191,8 +191,8 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
 
 static ucs4_t
 _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
-                              _VOID_PTR data               _AND
-                              _CONST unsigned char **inbuf _AND
+                              _VOID_PTR data,
+                              _CONST unsigned char **inbuf,
                               size_t *inbytesleft)
 {
   register ucs2_t w1;
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index fda1e6e3b..f02dd6fcc 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -44,9 +44,9 @@
 #if defined (ICONV_FROM_UCS_CES_UTF_8)
 static size_t
 _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
-                         _VOID_PTR data         _AND
-                         register ucs4_t in     _AND
-                         unsigned char **outbuf _AND
+                         _VOID_PTR data,
+                         register ucs4_t in,
+                         unsigned char **outbuf,
                          size_t *outbytesleft)
 {
   register unsigned char *cp;
@@ -126,8 +126,8 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
 #if defined (ICONV_TO_UCS_CES_UTF_8)
 static ucs4_t
 _DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
-                       _VOID_PTR data               _AND
-                       _CONST unsigned char **inbuf _AND
+                       _VOID_PTR data,
+                       _CONST unsigned char **inbuf,
                        size_t *inbytesleft)
 {
   register _CONST unsigned char *in = *inbuf;
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 41497c608..278b84915 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -49,7 +49,7 @@
  */
 static _CONST char *
 _DEFUN(canonical_form, (rptr, str), 
-                       struct _reent *rptr _AND
+                       struct _reent *rptr,
                        _CONST char *str)
 {
   char *p, *p1;
@@ -94,9 +94,9 @@ _DEFUN(canonical_form, (rptr, str),
  */
 static char *
 _DEFUN(find_alias, (rptr, alias, table, len),
-                   struct _reent *rptr _AND
-                   _CONST char *alias  _AND
-                   _CONST char *table  _AND
+                   struct _reent *rptr,
+                   _CONST char *alias,
+                   _CONST char *table,
                    int len)
 {
   _CONST char *end;
@@ -148,7 +148,7 @@ search_again:
  */
 char *
 _DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path), 
-                                     struct _reent *rptr _AND
+                                     struct _reent *rptr,
                                      _CONST char *ca)
 {
   char *p = (char *)ca;
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index 9d9d6a717..b8000e4be 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -121,7 +121,7 @@ No supporting OS subroutine calls are required.
 
 iconv_t
 _DEFUN(iconv_open, (to, from), 
-                   _CONST char *to _AND
+                   _CONST char *to,
                    _CONST char *from)
 {
   return _iconv_open_r (_REENT, to, from);
@@ -130,10 +130,10 @@ _DEFUN(iconv_open, (to, from),
 
 size_t
 _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
-              iconv_t cd          _AND
-              char **__restrict inbuf _AND
-              size_t *__restrict inbytesleft _AND
-              char **__restrict outbuf       _AND
+              iconv_t cd,
+              char **__restrict inbuf,
+              size_t *__restrict inbytesleft,
+              char **__restrict outbuf,
               size_t *__restrict outbytesleft)
 {
     return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft,
@@ -151,8 +151,8 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
 #ifndef _REENT_ONLY
 iconv_t
 _DEFUN(_iconv_open_r, (rptr, to, from),
-                      struct _reent *rptr _AND
-                      _CONST char *to     _AND
+                      struct _reent *rptr,
+                      _CONST char *to,
                       _CONST char *from)
 {
   iconv_conversion_t *ic;
@@ -202,11 +202,11 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
 
 size_t
 _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                 struct _reent *rptr _AND
-                 iconv_t cd          _AND
-                 _CONST char **inbuf _AND
-                 size_t *inbytesleft _AND
-                 char **outbuf       _AND
+                 struct _reent *rptr,
+                 iconv_t cd,
+                 _CONST char **inbuf,
+                 size_t *inbytesleft,
+                 char **outbuf,
                  size_t *outbytesleft)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -289,7 +289,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
 
 int
 _DEFUN(_iconv_close_r, (rptr, cd),
-                       struct _reent *rptr _AND
+                       struct _reent *rptr,
                        iconv_t cd)
 {
   int res;
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index 1b42f2c7b..3223e1303 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -60,9 +60,9 @@
  */
 _CONST char *
 _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
-                                      struct _reent *rptr _AND
-                                      _CONST char *file   _AND
-                                      _CONST char *dir    _AND
+                                      struct _reent *rptr,
+                                      _CONST char *file,
+                                      _CONST char *dir,
                                       _CONST char *ext)
 {
   int len1, len2, len3;
@@ -115,7 +115,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
  */
 int
 _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
-                                  iconv_t cd _AND
+                                  iconv_t cd,
                                   int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -138,7 +138,7 @@ _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
  */
 int
 _DEFUN(_iconv_nls_is_stateful, (cd, direction),
-                               iconv_t cd _AND
+                               iconv_t cd,
                                int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -167,11 +167,11 @@ _DEFUN(_iconv_nls_is_stateful, (cd, direction),
  */
 size_t
 _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                        struct _reent *rptr _AND
-                        iconv_t cd          _AND
-                        _CONST char **inbuf _AND
-                        size_t *inbytesleft _AND
-                        char **outbuf       _AND
+                        struct _reent *rptr,
+                        iconv_t cd,
+                        _CONST char **inbuf,
+                        size_t *inbytesleft,
+                        char **outbuf,
                         size_t *outbytesleft)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -221,8 +221,8 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
  */
 _VOID
 _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
-                             iconv_t cd    _AND
-                             mbstate_t *ps _AND
+                             iconv_t cd,
+                             mbstate_t *ps,
                              int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -248,8 +248,8 @@ _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
  */
 int
 _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
-                             iconv_t cd    _AND
-                             mbstate_t *ps _AND
+                             iconv_t cd,
+                             mbstate_t *ps,
                              int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -260,8 +260,8 @@ _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
 /* Same as iconv_open() but don't perform name resolving */
 static iconv_t
 _DEFUN(iconv_open1, (rptr, to, from),
-                     struct _reent *rptr _AND
-                     _CONST char *to     _AND
+                     struct _reent *rptr,
+                     _CONST char *to,
                      _CONST char *from)
 {
   iconv_conversion_t *ic;
@@ -317,10 +317,10 @@ _DEFUN(iconv_open1, (rptr, to, from),
  */
 int
 _DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
-                        struct _reent *rptr   _AND
-                        _CONST char *encoding _AND
-                        iconv_t *tomb         _AND
-                        iconv_t *towc         _AND
+                        struct _reent *rptr,
+                        _CONST char *encoding,
+                        iconv_t *tomb,
+                        iconv_t *towc,
                         int flag)
 {
   _CONST char *wchar_encoding;
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index d35027f9c..7ddbc77bd 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -37,8 +37,8 @@ static int null_conversion_dummy_data;
 
 static _VOID_PTR
 _DEFUN(null_conversion_open, (rptr, to, from),
-                             struct _reent *rptr _AND
-                             _CONST char *to     _AND
+                             struct _reent *rptr,
+                             _CONST char *to,
                              _CONST char *from)
 {
   return (_VOID_PTR)&null_conversion_dummy_data;
@@ -47,7 +47,7 @@ _DEFUN(null_conversion_open, (rptr, to, from),
 
 static size_t
 _DEFUN(null_conversion_close, (rptr, data),
-                              struct _reent *rptr _AND
+                              struct _reent *rptr,
                               _VOID_PTR data)
 {
   return 0;
@@ -57,12 +57,12 @@ _DEFUN(null_conversion_close, (rptr, data),
 static size_t
 _DEFUN(null_conversion_convert,
                      (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
-                     struct _reent *rptr          _AND
-                     _VOID_PTR data               _AND
-                     _CONST unsigned char **inbuf _AND
-                     size_t *inbytesleft          _AND
-                     unsigned char **outbuf       _AND
-                     size_t *outbytesleft         _AND
+                     struct _reent *rptr,
+                     _VOID_PTR data,
+                     _CONST unsigned char **inbuf,
+                     size_t *inbytesleft,
+                     unsigned char **outbuf,
+                     size_t *outbytesleft,
                      int flags)
 {
   size_t result;
@@ -94,7 +94,7 @@ _DEFUN(null_conversion_convert,
 
 static int
 _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
-                                       _VOID_PTR data     _AND
+                                       _VOID_PTR data,
                                        int direction)
 {
   return ICONV_MB_LEN_MAX;
@@ -103,8 +103,8 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
 
 static _VOID
 _DEFUN(null_conversion_get_state, (data, state, size),
-                                  _VOID_PTR data   _AND
-                                  mbstate_t *state _AND
+                                  _VOID_PTR data,
+                                  mbstate_t *state,
                                   int direction)
 {
   return;
@@ -113,8 +113,8 @@ _DEFUN(null_conversion_get_state, (data, state, size),
 
 static int
 _DEFUN(null_conversion_set_state, (data, state, direction),
-                                  _VOID_PTR data   _AND
-                                  mbstate_t *state _AND
+                                  _VOID_PTR data,
+                                  mbstate_t *state,
                                   int direction)
 {
   return 0;
@@ -122,7 +122,7 @@ _DEFUN(null_conversion_set_state, (data, state, direction),
 
 static int
 _DEFUN(null_conversion_is_stateful, (data, direction),
-                                    _VOID_PTR data _AND
+                                    _VOID_PTR data,
                                     int direction)
 {
   return 0;
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index cc5ceb953..46ad33efe 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -46,8 +46,8 @@ _EXFUN(find_encoding_name, (_CONST char *searchee,
 
 static _VOID_PTR
 _DEFUN(ucs_based_conversion_open, (rptr, to, from),
-                                  struct _reent *rptr _AND
-                                  _CONST char *to     _AND
+                                  struct _reent *rptr,
+                                  _CONST char *to,
                                   _CONST char *from)
 {
   iconv_ucs_conversion_t *uc;
@@ -124,7 +124,7 @@ error:
 
 static size_t
 _DEFUN(ucs_based_conversion_close, (rptr, data),
-                                   struct _reent *rptr _AND
+                                   struct _reent *rptr,
                                    _VOID_PTR data)
 {
   iconv_ucs_conversion_t *uc;
@@ -146,12 +146,12 @@ _DEFUN(ucs_based_conversion_close, (rptr, data),
 static size_t
 _DEFUN(ucs_based_conversion_convert,
                  (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
-                 struct _reent *rptr          _AND
-                 _VOID_PTR data               _AND
-                 _CONST unsigned char **inbuf _AND
-                 size_t *inbytesleft          _AND
-                 unsigned char **outbuf       _AND
-                 size_t *outbytesleft         _AND
+                 struct _reent *rptr,
+                 _VOID_PTR data,
+                 _CONST unsigned char **inbuf,
+                 size_t *inbytesleft,
+                 unsigned char **outbuf,
+                 size_t *outbytesleft,
                  int flags)
 {
   unsigned char outbuf1[ICONV_MB_LEN_MAX];
@@ -239,7 +239,7 @@ _DEFUN(ucs_based_conversion_convert,
 
 static int
 _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
-                                            _VOID_PTR data _AND
+                                            _VOID_PTR data,
                                             int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -253,8 +253,8 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
 
 static _VOID
 _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
-                                       _VOID_PTR data   _AND
-                                       mbstate_t *state _AND
+                                       _VOID_PTR data,
+                                       mbstate_t *state,
                                        int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -281,8 +281,8 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
 
 static int
 _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
-                                       _VOID_PTR data   _AND
-                                       mbstate_t *state _AND
+                                       _VOID_PTR data,
+                                       mbstate_t *state,
                                        int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -303,7 +303,7 @@ _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
 
 static int
 _DEFUN(ucs_based_conversion_is_stateful, (data, direction),
-                                         _VOID_PTR data _AND
+                                         _VOID_PTR data,
                                          int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -343,7 +343,7 @@ _iconv_ucs_conversion_handlers =
 
 static int
 _DEFUN(find_encoding_name, (searchee, names),
-                           _CONST char *searchee _AND
+                           _CONST char *searchee,
                            _CONST char **names)
 {
   _CONST char *p;