ansification: remove _DEFUN

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

15 files changed, 85 insertions, 171 deletions

diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index fb0a50e90..29d36f941 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -101,8 +101,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
 
 #if defined (ICONV_FROM_UCS_CES_EUC)
 static void *
-_DEFUN(euc_from_ucs_init, (rptr, encoding),
-                          struct _reent *rptr,
+euc_from_ucs_init (struct _reent *rptr,
                           const char *encoding)
 {
   int i;
@@ -165,8 +164,7 @@ error1:
 }
 
 static size_t
-_DEFUN(euc_from_ucs_close, (rptr, data),
-                           struct _reent *rptr,
+euc_from_ucs_close (struct _reent *rptr,
                            void *data)
 {
   int i;
@@ -185,8 +183,7 @@ _DEFUN(euc_from_ucs_close, (rptr, data),
 }
 
 static size_t
-_DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                             void *data,
+euc_convert_from_ucs (void *data,
                              register ucs4_t in,
                              unsigned char **outbuf,
                              size_t *outbytesleft)
@@ -261,8 +258,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_EUC)
 static void *
-_DEFUN(euc_to_ucs_init, (rptr, encoding),
-                        struct _reent *rptr,
+euc_to_ucs_init (struct _reent *rptr,
                         const char *encoding)
 {
   int i;
@@ -325,8 +321,7 @@ error1:
 }
 
 static size_t
-_DEFUN(euc_to_ucs_close, (rptr, data),
-                         struct _reent *rptr,
+euc_to_ucs_close (struct _reent *rptr,
                          void *data)
 {
   int i;
@@ -345,8 +340,7 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
 }
 
 static ucs4_t
-_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
-                           void *data,
+euc_convert_to_ucs (void *data,
                            const unsigned char **inbuf,
                            size_t *inbytesleft)
 {
@@ -432,8 +426,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_EUC */
 
 static int
-_DEFUN(euc_get_mb_cur_max, (data),
-                           void *data)
+euc_get_mb_cur_max (void *data)
 {
   return ((euc_data_t *)data)->mb_cur_max;
 }
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index 77b820bae..45cfe6267 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -40,8 +40,7 @@
 
 #if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
 static size_t
-_DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               void *data,
+table_pcs_convert_from_ucs (void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -65,24 +64,21 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
 }
 
 static void *
-_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
-                                struct _reent *rptr,
+table_pcs_from_ucs_init (struct _reent *rptr,
                                 const char *encoding)
 {
   return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
 }
 
 static size_t
-_DEFUN(table_pcs_from_ucs_close, (rptr, data),
-                                 struct _reent *rptr,
+table_pcs_from_ucs_close (struct _reent *rptr,
                                  void *data)
 {
   return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
 }
 
 static int
-_DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
-                                           void *data)
+table_pcs_from_ucs_get_mb_cur_max (void *data)
 {
   return _iconv_from_ucs_ces_handlers_table.get_mb_cur_max (data);
 }
@@ -91,8 +87,7 @@ _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 *data,
+table_pcs_convert_to_ucs (void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -113,24 +108,21 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
 }
 
 static void *
-_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
-                              struct _reent *rptr,
+table_pcs_to_ucs_init (struct _reent *rptr,
                               const char *encoding)
 {
   return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
 }
 
 static size_t
-_DEFUN(table_pcs_to_ucs_close, (rptr, data),
-                               struct _reent *rptr,
+table_pcs_to_ucs_close (struct _reent *rptr,
                                void *data)
 {
   return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
 }
 
 static int
-_DEFUN(table_pcs_to_ucs_get_mb_cur_max, (data),
-                                         void *data)
+table_pcs_to_ucs_get_mb_cur_max (void *data)
 {
   return _iconv_to_ucs_ces_handlers_table.get_mb_cur_max (data);
 }
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 969c0944b..2b844d558 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -74,8 +74,7 @@ _EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
  * Interface data and functions implementation.
  */
 static size_t
-_DEFUN(table_close, (rptr, data),
-                    struct _reent *rptr,
+table_close (struct _reent *rptr,
                     void *data)
 {
   const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -89,8 +88,7 @@ _DEFUN(table_close, (rptr, data),
 
 #if defined (ICONV_FROM_UCS_CES_TABLE)
 static void *
-_DEFUN(table_init_from_ucs, (rptr, encoding),
-                            struct _reent *rptr,
+table_init_from_ucs (struct _reent *rptr,
                             const char *encoding)
 {
   int i;
@@ -127,8 +125,7 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
 }
 
 static size_t
-_DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               void *data,
+table_convert_from_ucs (void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -172,8 +169,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_TABLE)
 static void *
-_DEFUN(table_init_to_ucs, (rptr, encoding),
-                          struct _reent *rptr,
+table_init_to_ucs (struct _reent *rptr,
                           const char *encoding)
 {
   int i;
@@ -210,8 +206,7 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
 }
 
 static ucs4_t
-_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
-                             void *data,
+table_convert_to_ucs (void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -253,8 +248,7 @@ _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_TABLE */
 
 static int
-_DEFUN(table_get_mb_cur_max, (data),
-                             void *data)
+table_get_mb_cur_max (void *data)
 {
   return ((iconv_ccs_desc_t *)data)->bits/8;
 }
@@ -303,8 +297,7 @@ _iconv_from_ucs_ces_handlers_table =
  *     Code that corresponds to 'code'.
  */
 static __inline ucs2_t
-_DEFUN(find_code_speed, (code, tblp),
-                        ucs2_t code,
+find_code_speed (ucs2_t code,
                         const __uint16_t *tblp)
 {
   int idx = tblp[code >> 8];
@@ -326,8 +319,7 @@ _DEFUN(find_code_speed, (code, tblp),
  *     Code that corresponds to 'code'.
  */
 static __inline ucs2_t
-_DEFUN(find_code_speed_8bit, (code, tblp),
-                             ucs2_t code,
+find_code_speed_8bit (ucs2_t code,
                              const unsigned char *tblp)
 {
   int idx;
@@ -366,8 +358,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
  *     Code that corresponds to 'code'.
  */
 static ucs2_t
-_DEFUN(find_code_size, (code, tblp),
-                       ucs2_t code,
+find_code_size (ucs2_t code,
                        const __uint16_t *tblp)
 {
   int first, last, cur, center;
@@ -460,8 +451,7 @@ _DEFUN(find_code_size, (code, tblp),
  *    iconv_ccs_desc_t * pointer is success, NULL if failure.
  */
 static const iconv_ccs_desc_t *
-_DEFUN(load_file, (rptr, name, direction), 
-                  struct _reent *rptr,
+load_file (struct _reent *rptr,
                   const char *name,
                   int direction)
 {
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 2c9169473..3473444cf 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -44,8 +44,7 @@
  
 #if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
 static size_t
-_DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        void *data,
+ucs_2_internal_convert_from_ucs (void *data,
                                         register ucs4_t in,
                                         unsigned char **outbuf,
                                         size_t *outbytesleft)
@@ -66,8 +65,7 @@ _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 *data,
+ucs_2_internal_convert_to_ucs (void *data,
                                       const unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
@@ -89,8 +87,7 @@ _DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UCS_2_INTERNAL */
 
 static int
-_DEFUN(ucs_2_internal_get_mb_cur_max, (data),
-                                      void *data)
+ucs_2_internal_get_mb_cur_max (void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index a99562eec..5e965b080 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -50,8 +50,7 @@
 #define UCS_2LE "ucs_2le"
 
 static void *
-_DEFUN(ucs_2_init, (rptr, encoding),
-                   struct _reent *rptr,
+ucs_2_init (struct _reent *rptr,
                    const char *encoding)
 {
   int *data;
@@ -68,8 +67,7 @@ _DEFUN(ucs_2_init, (rptr, encoding),
 }
 
 static size_t
-_DEFUN(ucs_2_close, (rptr, data),
-                    struct _reent *rptr,
+ucs_2_close (struct _reent *rptr,
                     void *data)
 {
   _free_r (rptr, data);
@@ -78,8 +76,7 @@ _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 *data,
+ucs_2_convert_from_ucs (void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -105,8 +102,7 @@ _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 *data,
+ucs_2_convert_to_ucs (void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -132,8 +128,7 @@ _DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UCS_2 */
 
 static int
-_DEFUN(ucs_2_get_mb_cur_max, (data),
-                             void *data)
+ucs_2_get_mb_cur_max (void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index a5c6d7e09..d10952c55 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -44,8 +44,7 @@
 
 #if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
 static size_t
-_DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        void *data,
+ucs_4_internal_convert_from_ucs (void *data,
                                         register ucs4_t in,
                                         unsigned char **outbuf,
                                         size_t *outbytesleft)
@@ -66,8 +65,7 @@ _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 *data,
+ucs_4_internal_convert_to_ucs (void *data,
                                       const unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
@@ -89,8 +87,7 @@ _DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UCS_4_INTERNAL */
 
 static int
-_DEFUN(ucs_4_internal_get_mb_cur_max, (data),
-                                      void *data)
+ucs_4_internal_get_mb_cur_max (void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index 0009981fe..290cc71f8 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -51,8 +51,7 @@
 #define UCS_4LE "ucs_4le"
 
 static void *
-_DEFUN(ucs_4_init, (rptr, encoding),
-                   struct _reent *rptr,
+ucs_4_init (struct _reent *rptr,
                    const char *encoding)
 {
   int *data;
@@ -69,8 +68,7 @@ _DEFUN(ucs_4_init, (rptr, encoding),
 }
 
 static size_t
-_DEFUN(ucs_4_close, (rptr, data),
-                    struct _reent *rptr,
+ucs_4_close (struct _reent *rptr,
                     void *data)
 {
   _free_r(rptr, data);
@@ -80,8 +78,7 @@ _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 *data,
+ucs_4_convert_from_ucs (void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -107,8 +104,7 @@ _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 *data,
+ucs_4_convert_to_ucs (void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -134,8 +130,7 @@ _DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UCS_4 */
 
 static int
-_DEFUN(ucs_4_get_mb_cur_max, (data),
-                             void *data)
+ucs_4_get_mb_cur_max (void *data)
 {
   return 4;
 }
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index e6a665070..164679178 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -40,8 +40,7 @@
 
 #if defined (ICONV_FROM_UCS_CES_US_ASCII)
 static size_t
-_DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                  void *data,
+us_ascii_convert_from_ucs (void *data,
                                   ucs4_t in,
                                   unsigned char **outbuf,
                                   size_t *outbytesleft)
@@ -60,8 +59,7 @@ _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 *data,
+us_ascii_convert_to_ucs (void *data,
                                 const unsigned char **inbuf,
                                 size_t *inbytesleft)
 {
@@ -83,8 +81,7 @@ _DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_US_ASCII */
 
 static int
-_DEFUN(us_ascii_get_mb_cur_max, (data),
-                                void *data)
+us_ascii_get_mb_cur_max (void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index dd62a5dea..a3491bb3c 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -58,8 +58,7 @@
 #define UTF_16LE "utf_16le"
 
 static size_t
-_DEFUN(utf_16_close, (rptr, data),
-                     struct _reent *rptr,
+utf_16_close (struct _reent *rptr,
                      void *data)
 {
   _free_r(rptr, data);
@@ -68,8 +67,7 @@ _DEFUN(utf_16_close, (rptr, data),
 
 #if defined (ICONV_FROM_UCS_CES_UTF_16)
 static void *
-_DEFUN(utf_16_init_from_ucs, (rptr, encoding),
-                             struct _reent *rptr,
+utf_16_init_from_ucs (struct _reent *rptr,
                              const char *encoding)
 {
   int *data;
@@ -88,8 +86,7 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
 }
 
 static size_t
-_DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                void *data,
+utf_16_convert_from_ucs (void *data,
                                 register ucs4_t in,
                                 unsigned char **outbuf,
                                 size_t *outbytesleft)
@@ -170,8 +167,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
 
 #if defined (ICONV_TO_UCS_CES_UTF_16)
 static void *
-_DEFUN(utf_16_init_to_ucs, (rptr, encoding),
-                           struct _reent *rptr,
+utf_16_init_to_ucs (struct _reent *rptr,
                            const char *encoding)
 {
   int *data;
@@ -190,8 +186,7 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
 }
 
 static ucs4_t
-_DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
-                              void *data,
+utf_16_convert_to_ucs (void *data,
                               const unsigned char **inbuf,
                               size_t *inbytesleft)
 {
@@ -268,8 +263,7 @@ _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UTF_16 */
 
 static int
-_DEFUN(utf_16_get_mb_cur_max, (data),
-                              void *data)
+utf_16_get_mb_cur_max (void *data)
 {
   return 6;
 }
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index 5559272d7..116f25925 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -43,8 +43,7 @@
 
 #if defined (ICONV_FROM_UCS_CES_UTF_8)
 static size_t
-_DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
-                         void *data,
+convert_from_ucs (void *data,
                          register ucs4_t in,
                          unsigned char **outbuf,
                          size_t *outbytesleft)
@@ -125,8 +124,7 @@ _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 *data,
+convert_to_ucs (void *data,
                        const unsigned char **inbuf,
                        size_t *inbytesleft)
 {
@@ -259,8 +257,7 @@ _DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
 #endif /* ICONV_TO_UCS_CES_UTF_8 */
 
 static int
-_DEFUN(get_mb_cur_max, (data),
-                       void *data)
+get_mb_cur_max (void *data)
 {
   return UTF8_MB_CUR_MAX;
 }
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 7c932e65c..d04cebb57 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -48,8 +48,7 @@
  *   Returns canonical form of 'str' if success, NULL if failure.
  */
 static const char *
-_DEFUN(canonical_form, (rptr, str), 
-                       struct _reent *rptr,
+canonical_form (struct _reent *rptr,
                        const char *str)
 {
   char *p, *p1;
@@ -93,8 +92,7 @@ _DEFUN(canonical_form, (rptr, str),
  *   and sets current thread's/process's errno.
  */
 static char *
-_DEFUN(find_alias, (rptr, alias, table, len),
-                   struct _reent *rptr,
+find_alias (struct _reent *rptr,
                    const char *alias,
                    const char *table,
                    int len)
@@ -147,8 +145,7 @@ search_again:
  *   and sets current thread's/process's errno.
  */
 char *
-_DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path), 
-                                     struct _reent *rptr,
+_iconv_resolve_encoding_name (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 0cf3cf5ff..02c749d7f 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -120,8 +120,7 @@ No supporting OS subroutine calls are required.
  */
 
 iconv_t
-_DEFUN(iconv_open, (to, from), 
-                   const char *to,
+iconv_open (const char *to,
                    const char *from)
 {
   return _iconv_open_r (_REENT, to, from);
@@ -129,8 +128,7 @@ _DEFUN(iconv_open, (to, from),
 
 
 size_t
-_DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
-              iconv_t cd,
+iconv (iconv_t cd,
               char **__restrict inbuf,
               size_t *__restrict inbytesleft,
               char **__restrict outbuf,
@@ -142,7 +140,7 @@ _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
 
 
 int
-_DEFUN(iconv_close, (cd), iconv_t cd)
+iconv_close (iconv_t cd)
 {
     return _iconv_close_r (_REENT, cd);
 }
@@ -150,8 +148,7 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
 
 #ifndef _REENT_ONLY
 iconv_t
-_DEFUN(_iconv_open_r, (rptr, to, from),
-                      struct _reent *rptr,
+_iconv_open_r (struct _reent *rptr,
                       const char *to,
                       const char *from)
 {
@@ -201,8 +198,7 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
 
 
 size_t
-_DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                 struct _reent *rptr,
+_iconv_r (struct _reent *rptr,
                  iconv_t cd,
                  const char **inbuf,
                  size_t *inbytesleft,
@@ -288,8 +284,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
 
 
 int
-_DEFUN(_iconv_close_r, (rptr, cd),
-                       struct _reent *rptr,
+_iconv_close_r (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 dfb6a18dd..ed8f3a7ba 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -59,8 +59,7 @@
  *   and sets current thread's/process's errno.
  */
 const char *
-_DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
-                                      struct _reent *rptr,
+_iconv_nls_construct_filename (struct _reent *rptr,
                                       const char *file,
                                       const char *dir,
                                       const char *ext)
@@ -114,8 +113,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
  *    "to" encoding's value if 'direction' isn't 0.
  */
 int
-_DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
-                                  iconv_t cd,
+_iconv_nls_get_mb_cur_max (iconv_t cd,
                                   int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -137,8 +135,7 @@ _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
 
  */
 int
-_DEFUN(_iconv_nls_is_stateful, (cd, direction),
-                               iconv_t cd,
+_iconv_nls_is_stateful (iconv_t cd,
                                int direction)
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -166,8 +163,7 @@ _DEFUN(_iconv_nls_is_stateful, (cd, direction),
  *    Same as _iconv_r.
  */
 size_t
-_DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                        struct _reent *rptr,
+_iconv_nls_conv (struct _reent *rptr,
                         iconv_t cd,
                         const char **inbuf,
                         size_t *inbytesleft,
@@ -220,8 +216,7 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
  *    if 'direction' isn't 0.
  */
 void
-_DEFUN(_iconv_nls_get_state, (cd, ps, direction),
-                             iconv_t cd,
+_iconv_nls_get_state (iconv_t cd,
                              mbstate_t *ps,
                              int direction)
 {
@@ -247,8 +242,7 @@ _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
  *    0 if success, -1 if failure.
  */
 int
-_DEFUN(_iconv_nls_set_state, (cd, ps, direction),
-                             iconv_t cd,
+_iconv_nls_set_state (iconv_t cd,
                              mbstate_t *ps,
                              int direction)
 {
@@ -259,8 +253,7 @@ _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,
+iconv_open1 (struct _reent *rptr,
                      const char *to,
                      const char *from)
 {
@@ -316,8 +309,7 @@ _DEFUN(iconv_open1, (rptr, to, from),
  *     If successful - return 0, else set errno and return -1.
  */
 int
-_DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
-                        struct _reent *rptr,
+_iconv_nls_open (struct _reent *rptr,
                         const char *encoding,
                         iconv_t *tomb,
                         iconv_t *towc,
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 8040c24e7..e75d83376 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -36,8 +36,7 @@ static int null_conversion_dummy_data;
 
 
 static void *
-_DEFUN(null_conversion_open, (rptr, to, from),
-                             struct _reent *rptr,
+null_conversion_open (struct _reent *rptr,
                              const char *to,
                              const char *from)
 {
@@ -46,8 +45,7 @@ _DEFUN(null_conversion_open, (rptr, to, from),
 
 
 static size_t
-_DEFUN(null_conversion_close, (rptr, data),
-                              struct _reent *rptr,
+null_conversion_close (struct _reent *rptr,
                               void *data)
 {
   return 0;
@@ -55,9 +53,7 @@ _DEFUN(null_conversion_close, (rptr, data),
 
 
 static size_t
-_DEFUN(null_conversion_convert,
-                     (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
-                     struct _reent *rptr,
+null_conversion_convert (struct _reent *rptr,
                      void *data,
                      const unsigned char **inbuf,
                      size_t *inbytesleft,
@@ -93,8 +89,7 @@ _DEFUN(null_conversion_convert,
 
 
 static int
-_DEFUN(null_conversion_get_mb_cur_max, (data, direction),
-                                       void *data,
+null_conversion_get_mb_cur_max (void *data,
                                        int direction)
 {
   return ICONV_MB_LEN_MAX;
@@ -102,8 +97,7 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
 
 
 static void
-_DEFUN(null_conversion_get_state, (data, state, size),
-                                  void *data,
+null_conversion_get_state (void *data,
                                   mbstate_t *state,
                                   int direction)
 {
@@ -112,8 +106,7 @@ _DEFUN(null_conversion_get_state, (data, state, size),
 
 
 static int
-_DEFUN(null_conversion_set_state, (data, state, direction),
-                                  void *data,
+null_conversion_set_state (void *data,
                                   mbstate_t *state,
                                   int direction)
 {
@@ -121,8 +114,7 @@ _DEFUN(null_conversion_set_state, (data, state, direction),
 }
 
 static int
-_DEFUN(null_conversion_is_stateful, (data, direction),
-                                    void *data,
+null_conversion_is_stateful (void *data,
                                     int direction)
 {
   return 0;
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index f480aee63..8c3d19073 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -45,8 +45,7 @@ _EXFUN(find_encoding_name, (const char *searchee,
  */
 
 static void *
-_DEFUN(ucs_based_conversion_open, (rptr, to, from),
-                                  struct _reent *rptr,
+ucs_based_conversion_open (struct _reent *rptr,
                                   const char *to,
                                   const char *from)
 {
@@ -123,8 +122,7 @@ error:
 
 
 static size_t
-_DEFUN(ucs_based_conversion_close, (rptr, data),
-                                   struct _reent *rptr,
+ucs_based_conversion_close (struct _reent *rptr,
                                    void *data)
 {
   iconv_ucs_conversion_t *uc;
@@ -144,9 +142,7 @@ _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,
+ucs_based_conversion_convert (struct _reent *rptr,
                  void *data,
                  const unsigned char **inbuf,
                  size_t *inbytesleft,
@@ -238,8 +234,7 @@ _DEFUN(ucs_based_conversion_convert,
 
 
 static int
-_DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
-                                            void *data,
+ucs_based_conversion_get_mb_cur_max (void *data,
                                             int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -252,8 +247,7 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
 
 
 static void
-_DEFUN(ucs_based_conversion_get_state, (data, state, direction),
-                                       void *data,
+ucs_based_conversion_get_state (void *data,
                                        mbstate_t *state,
                                        int direction)
 {
@@ -280,8 +274,7 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
 
 
 static int
-_DEFUN(ucs_based_conversion_set_state, (data, state, direction),
-                                       void *data,
+ucs_based_conversion_set_state (void *data,
                                        mbstate_t *state,
                                        int direction)
 {
@@ -302,8 +295,7 @@ _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
 }
 
 static int
-_DEFUN(ucs_based_conversion_is_stateful, (data, direction),
-                                         void *data,
+ucs_based_conversion_is_stateful (void *data,
                                          int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -342,8 +334,7 @@ _iconv_ucs_conversion_handlers =
  */
 
 static int
-_DEFUN(find_encoding_name, (searchee, names),
-                           const char *searchee,
+find_encoding_name (const char *searchee,
                            const char **names)
 {
   const char *p;