[v2,06/17] ansification: remove _VOID_PTR

Message ID 20171207181909.1112-7-yselkowi@redhat.com
State New
Headers show
Series
  • Newlib ANSI-fication
Related show

Commit Message

Yaakov Selkowitz Dec. 7, 2017, 6:18 p.m.
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

---
 newlib/libc/iconv/ces/euc.c            | 24 +++++++++---------
 newlib/libc/iconv/ces/table-pcs.c      | 16 ++++++------
 newlib/libc/iconv/ces/table.c          | 40 ++++++++++++++---------------
 newlib/libc/iconv/ces/ucs-2-internal.c |  6 ++---
 newlib/libc/iconv/ces/ucs-2.c          | 14 +++++------
 newlib/libc/iconv/ces/ucs-4-internal.c |  6 ++---
 newlib/libc/iconv/ces/ucs-4.c          | 14 +++++------
 newlib/libc/iconv/ces/us-ascii.c       |  6 ++---
 newlib/libc/iconv/ces/utf-16.c         | 20 +++++++--------
 newlib/libc/iconv/ces/utf-8.c          |  6 ++---
 newlib/libc/iconv/lib/aliasesi.c       |  2 +-
 newlib/libc/iconv/lib/conv.h           | 28 ++++++++++-----------
 newlib/libc/iconv/lib/iconv.c          | 18 ++++++-------
 newlib/libc/iconv/lib/iconvnls.c       |  6 ++---
 newlib/libc/iconv/lib/local.h          |  3 ---
 newlib/libc/iconv/lib/nullconv.c       | 16 ++++++------
 newlib/libc/iconv/lib/ucsconv.c        | 22 ++++++++--------
 newlib/libc/iconv/lib/ucsconv.h        | 46 +++++++++++++++++-----------------
 18 files changed, 145 insertions(+), 148 deletions(-)

-- 
2.15.1

Patch

diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index ab309a585..fb0a50e90 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -62,7 +62,7 @@  typedef struct
   int mb_cur_max;
   euc_cs_desc_t *desc;
   
-  _VOID_PTR data[MAX_CS_NUM];
+  void *data[MAX_CS_NUM];
 } euc_data_t;
 
 #if defined (_ICONV_TO_ENCODING_EUC_JP) \
@@ -100,7 +100,7 @@  static euc_cs_desc_t euc_kr_cs_desc [] =
 #endif
 
 #if defined (ICONV_FROM_UCS_CES_EUC)
-static _VOID_PTR
+static void *
 _DEFUN(euc_from_ucs_init, (rptr, encoding),
                           struct _reent *rptr,
                           const char *encoding)
@@ -160,14 +160,14 @@  error:
   _iconv_from_ucs_ces_handlers_table.close (rptr, data);
   return NULL;
 error1:
-  _free_r (rptr, (_VOID_PTR)data);
+  _free_r (rptr, (void *)data);
   return NULL;
 }
 
 static size_t
 _DEFUN(euc_from_ucs_close, (rptr, data),
                            struct _reent *rptr,
-                           _VOID_PTR data)
+                           void *data)
 {
   int i;
   size_t res = 0;
@@ -186,7 +186,7 @@  _DEFUN(euc_from_ucs_close, (rptr, data),
 
 static size_t
 _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                             _VOID_PTR data,
+                             void *data,
                              register ucs4_t in,
                              unsigned char **outbuf,
                              size_t *outbytesleft)
@@ -260,7 +260,7 @@  _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #endif /* ICONV_FROM_UCS_CES_EUC */
 
 #if defined (ICONV_TO_UCS_CES_EUC)
-static _VOID_PTR
+static void *
 _DEFUN(euc_to_ucs_init, (rptr, encoding),
                         struct _reent *rptr,
                         const char *encoding)
@@ -320,14 +320,14 @@  error:
   _iconv_to_ucs_ces_handlers_table.close (rptr, data);
   return NULL;
 error1:
-  _free_r (rptr, (_VOID_PTR)data);
+  _free_r (rptr, (void *)data);
   return NULL;
 }
 
 static size_t
 _DEFUN(euc_to_ucs_close, (rptr, data),
                          struct _reent *rptr,
-                         _VOID_PTR data)
+                         void *data)
 {
   int i;
   size_t res = 0;
@@ -346,7 +346,7 @@  _DEFUN(euc_to_ucs_close, (rptr, data),
 
 static ucs4_t
 _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
-                           _VOID_PTR data,
+                           void *data,
                            const unsigned char **inbuf,
                            size_t *inbytesleft)
 {
@@ -366,8 +366,8 @@  _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
  
   for (i = 1; d->desc[i].csname != NULL; i++)
     {
-      if (memcmp((const _VOID_PTR)(*inbuf),
-                 (const _VOID_PTR)d->desc[i].prefix,
+      if (memcmp((const void *)(*inbuf),
+                 (const void *)d->desc[i].prefix,
                  d->desc[i].prefixbytes) == 0)
         {
           if (((int)*inbytesleft - d->desc[i].prefixbytes - d->desc[i].bytes) < 0)
@@ -433,7 +433,7 @@  _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(euc_get_mb_cur_max, (data),
-                           _VOID_PTR data)
+                           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 1bab90986..77b820bae 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -41,7 +41,7 @@ 
 #if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
 static size_t
 _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data,
+                               void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -64,7 +64,7 @@  _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
                                                     outbytesleft);
 }
 
-static _VOID_PTR
+static void *
 _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
                                 struct _reent *rptr,
                                 const char *encoding)
@@ -75,14 +75,14 @@  _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
 static size_t
 _DEFUN(table_pcs_from_ucs_close, (rptr, data),
                                  struct _reent *rptr,
-                                 _VOID_PTR data)
+                                 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_PTR data)
+                                           void *data)
 {
   return _iconv_from_ucs_ces_handlers_table.get_mb_cur_max (data);
 }
@@ -92,7 +92,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_PTR data,
+                             void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -112,7 +112,7 @@  _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
                                                              inbytesleft);
 }
 
-static _VOID_PTR
+static void *
 _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
                               struct _reent *rptr,
                               const char *encoding)
@@ -123,14 +123,14 @@  _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
 static size_t
 _DEFUN(table_pcs_to_ucs_close, (rptr, data),
                                struct _reent *rptr,
-                               _VOID_PTR data)
+                               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_PTR data)
+                                         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 c02831a5b..969c0944b 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -76,19 +76,19 @@  _EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
 static size_t
 _DEFUN(table_close, (rptr, data),
                     struct _reent *rptr,
-                    _VOID_PTR data)
+                    void *data)
 {
   const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
 
   if (ccsp->type == TABLE_EXTERNAL)
-    _free_r (rptr, (_VOID_PTR)ccsp->tbl);
+    _free_r (rptr, (void *)ccsp->tbl);
 
-  _free_r( rptr, (_VOID_PTR)ccsp);
+  _free_r( rptr, (void *)ccsp);
   return 0;
 }
 
 #if defined (ICONV_FROM_UCS_CES_TABLE)
-static _VOID_PTR
+static void *
 _DEFUN(table_init_from_ucs, (rptr, encoding),
                             struct _reent *rptr,
                             const char *encoding)
@@ -116,11 +116,11 @@  _DEFUN(table_init_from_ucs, (rptr, encoding),
       ccsp->optimization = biccsp->from_ucs_type;
       ccsp->tbl = biccsp->from_ucs;
       
-      return (_VOID_PTR)ccsp;
+      return (void *)ccsp;
     }
     
 #ifdef _ICONV_ENABLE_EXTERNAL_CCS
-  return (_VOID_PTR)load_file (rptr, encoding, 1);
+  return (void *)load_file (rptr, encoding, 1);
 #else
   return NULL;
 #endif
@@ -128,7 +128,7 @@  _DEFUN(table_init_from_ucs, (rptr, encoding),
 
 static size_t
 _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data,
+                               void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -171,7 +171,7 @@  _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #endif /* ICONV_FROM_UCS_CES_TABLE */
 
 #if defined (ICONV_TO_UCS_CES_TABLE)
-static _VOID_PTR
+static void *
 _DEFUN(table_init_to_ucs, (rptr, encoding),
                           struct _reent *rptr,
                           const char *encoding)
@@ -199,11 +199,11 @@  _DEFUN(table_init_to_ucs, (rptr, encoding),
       ccsp->optimization = biccsp->to_ucs_type;
       ccsp->tbl = biccsp->to_ucs;
       
-      return (_VOID_PTR)ccsp;
+      return (void *)ccsp;
     }
   
 #ifdef _ICONV_ENABLE_EXTERNAL_CCS
-  return (_VOID_PTR)load_file (rptr, encoding, 0);
+  return (void *)load_file (rptr, encoding, 0);
 #else
   return NULL;
 #endif
@@ -211,7 +211,7 @@  _DEFUN(table_init_to_ucs, (rptr, encoding),
 
 static ucs4_t
 _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data,
+                             void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -254,7 +254,7 @@  _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(table_get_mb_cur_max, (data),
-                             _VOID_PTR data)
+                             void *data)
 {
   return ((iconv_ccs_desc_t *)data)->bits/8;
 }
@@ -490,7 +490,7 @@  _DEFUN(load_file, (rptr, name, direction),
   if ((buf = (const unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
     goto error2;
 
-  if (_read_r (rptr, fd, (_VOID_PTR)buf, hdrlen) != hdrlen)
+  if (_read_r (rptr, fd, (void *)buf, hdrlen) != hdrlen)
     goto error3;
 
   if (_16BIT_ELT (EXTTABLE_VERSION_OFF) != TABLE_VERSION_1
@@ -559,33 +559,33 @@  _DEFUN(load_file, (rptr, name, direction),
     goto error4;
 
   if (_lseek_r (rptr, fd, off, SEEK_SET) == (off_t)-1
-      || _read_r (rptr, fd, (_VOID_PTR)ccsp->tbl, tbllen) != tbllen)
+      || _read_r (rptr, fd, (void *)ccsp->tbl, tbllen) != tbllen)
     goto error5;
 
   goto normal_exit;
 
 error5:
-  _free_r (rptr, (_VOID_PTR)ccsp->tbl);
+  _free_r (rptr, (void *)ccsp->tbl);
   ccsp->tbl = NULL;
 error4:
-  _free_r (rptr, (_VOID_PTR)ccsp);
+  _free_r (rptr, (void *)ccsp);
   ccsp = NULL;
 error3:
 normal_exit:
-  _free_r (rptr, (_VOID_PTR)buf);
+  _free_r (rptr, (void *)buf);
 error2:
   if (_close_r (rptr, fd) == -1)
     {
       if (ccsp != NULL)
         {
           if (ccsp->tbl != NULL)
-            _free_r (rptr, (_VOID_PTR)ccsp->tbl);
-          _free_r (rptr, (_VOID_PTR)ccsp);
+            _free_r (rptr, (void *)ccsp->tbl);
+          _free_r (rptr, (void *)ccsp);
         }
       ccsp = NULL;
     }
 error1:
-  _free_r (rptr, (_VOID_PTR)fname);
+  _free_r (rptr, (void *)fname);
   return ccsp;
 }
 #endif
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 7aed01e88..2c9169473 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -45,7 +45,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_PTR data,
+                                        void *data,
                                         register ucs4_t in,
                                         unsigned char **outbuf,
                                         size_t *outbytesleft)
@@ -67,7 +67,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_PTR data,
+                                      void *data,
                                       const unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
@@ -90,7 +90,7 @@  _DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(ucs_2_internal_get_mb_cur_max, (data),
-                                      _VOID_PTR data)
+                                      void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index 7d03ee890..a99562eec 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -49,7 +49,7 @@ 
 #define UCS_2BE "ucs_2be"
 #define UCS_2LE "ucs_2le"
 
-static _VOID_PTR
+static void *
 _DEFUN(ucs_2_init, (rptr, encoding),
                    struct _reent *rptr,
                    const char *encoding)
@@ -57,20 +57,20 @@  _DEFUN(ucs_2_init, (rptr, encoding),
   int *data;
   
   if ((data = (int *) _malloc_r(rptr, sizeof (int))) == NULL)
-    return (_VOID_PTR)NULL;
+    return (void *)NULL;
   
   if (strcmp (encoding, UCS_2LE) == 0)
     *data = UCS_2_LITTLE_ENDIAN;
   else
     *data = UCS_2_BIG_ENDIAN;
      
-  return (_VOID_PTR)data;
+  return (void *)data;
 }
 
 static size_t
 _DEFUN(ucs_2_close, (rptr, data),
                     struct _reent *rptr,
-                    _VOID_PTR data)
+                    void *data)
 {
   _free_r (rptr, data);
   return 0;
@@ -79,7 +79,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_PTR data,
+                               void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -106,7 +106,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_PTR data,
+                             void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -133,7 +133,7 @@  _DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(ucs_2_get_mb_cur_max, (data),
-                             _VOID_PTR data)
+                             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 1df5f3fc6..a5c6d7e09 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -45,7 +45,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_PTR data,
+                                        void *data,
                                         register ucs4_t in,
                                         unsigned char **outbuf,
                                         size_t *outbytesleft)
@@ -67,7 +67,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_PTR data,
+                                      void *data,
                                       const unsigned char **inbuf,
                                       size_t *inbytesleft)
 {
@@ -90,7 +90,7 @@  _DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(ucs_4_internal_get_mb_cur_max, (data),
-                                      _VOID_PTR data)
+                                      void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index 8fbfa6aa1..0009981fe 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -50,7 +50,7 @@ 
 #define UCS_4BE "ucs_4be"
 #define UCS_4LE "ucs_4le"
 
-static _VOID_PTR
+static void *
 _DEFUN(ucs_4_init, (rptr, encoding),
                    struct _reent *rptr,
                    const char *encoding)
@@ -58,20 +58,20 @@  _DEFUN(ucs_4_init, (rptr, encoding),
   int *data;
   
   if ((data = (int *)_malloc_r (rptr, sizeof(int))) == NULL)
-    return (_VOID_PTR)NULL;
+    return (void *)NULL;
   
   if (strcmp (encoding, UCS_4LE) == 0)
     *data = UCS_4_LITTLE_ENDIAN;
   else
     *data = UCS_4_BIG_ENDIAN;
      
-  return (_VOID_PTR)data;
+  return (void *)data;
 }
 
 static size_t
 _DEFUN(ucs_4_close, (rptr, data),
                     struct _reent *rptr,
-                    _VOID_PTR data)
+                    void *data)
 {
   _free_r(rptr, data);
   return 0;
@@ -81,7 +81,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_PTR data,
+                               void *data,
                                ucs4_t in,
                                unsigned char **outbuf,
                                size_t *outbytesleft)
@@ -108,7 +108,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_PTR data,
+                             void *data,
                              const unsigned char **inbuf,
                              size_t *inbytesleft)
 {
@@ -135,7 +135,7 @@  _DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(ucs_4_get_mb_cur_max, (data),
-                             _VOID_PTR data)
+                             void *data)
 {
   return 4;
 }
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index 1fc7c5d89..e6a665070 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -41,7 +41,7 @@ 
 #if defined (ICONV_FROM_UCS_CES_US_ASCII)
 static size_t
 _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                  _VOID_PTR data,
+                                  void *data,
                                   ucs4_t in,
                                   unsigned char **outbuf,
                                   size_t *outbytesleft)
@@ -61,7 +61,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_PTR data,
+                                void *data,
                                 const unsigned char **inbuf,
                                 size_t *inbytesleft)
 {
@@ -84,7 +84,7 @@  _DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(us_ascii_get_mb_cur_max, (data),
-                                _VOID_PTR data)
+                                void *data)
 {
   return 2;
 }
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index fee97b0ee..dd62a5dea 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -60,14 +60,14 @@ 
 static size_t
 _DEFUN(utf_16_close, (rptr, data),
                      struct _reent *rptr,
-                     _VOID_PTR data)
+                     void *data)
 {
   _free_r(rptr, data);
   return 0;
 }
 
 #if defined (ICONV_FROM_UCS_CES_UTF_16)
-static _VOID_PTR
+static void *
 _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
                              struct _reent *rptr,
                              const char *encoding)
@@ -75,7 +75,7 @@  _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
   int *data;
   
   if ((data = (int *)_malloc_r (rptr, sizeof (int))) == NULL)
-    return (_VOID_PTR)NULL;
+    return (void *)NULL;
   
   if (strcmp (encoding, UTF_16LE) == 0)
     *data = UTF16_LITTLE_ENDIAN;
@@ -84,12 +84,12 @@  _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
   else
     *data = UTF16_SYSTEM_ENDIAN;
      
-  return (_VOID_PTR)data;
+  return (void *)data;
 }
 
 static size_t
 _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                _VOID_PTR data,
+                                void *data,
                                 register ucs4_t in,
                                 unsigned char **outbuf,
                                 size_t *outbytesleft)
@@ -169,7 +169,7 @@  _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
 #endif /* ICONV_FROM_UCS_CES_UTF_16 */
 
 #if defined (ICONV_TO_UCS_CES_UTF_16)
-static _VOID_PTR
+static void *
 _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
                            struct _reent *rptr,
                            const char *encoding)
@@ -177,7 +177,7 @@  _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
   int *data;
   
   if ((data = (int *)_malloc_r (rptr, sizeof (int))) == NULL)
-    return (_VOID_PTR)NULL;
+    return (void *)NULL;
   
   if (strcmp (encoding, UTF_16BE) == 0)
     *data = UTF16_BIG_ENDIAN;
@@ -186,12 +186,12 @@  _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
   else
     *data = UTF16_UNDEFINED;
      
-  return (_VOID_PTR)data;
+  return (void *)data;
 }
 
 static ucs4_t
 _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
-                              _VOID_PTR data,
+                              void *data,
                               const unsigned char **inbuf,
                               size_t *inbytesleft)
 {
@@ -269,7 +269,7 @@  _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(utf_16_get_mb_cur_max, (data),
-                              _VOID_PTR data)
+                              void *data)
 {
   return 6;
 }
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index ae778d12d..5559272d7 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -44,7 +44,7 @@ 
 #if defined (ICONV_FROM_UCS_CES_UTF_8)
 static size_t
 _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
-                         _VOID_PTR data,
+                         void *data,
                          register ucs4_t in,
                          unsigned char **outbuf,
                          size_t *outbytesleft)
@@ -126,7 +126,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_PTR data,
+                       void *data,
                        const unsigned char **inbuf,
                        size_t *inbytesleft)
 {
@@ -260,7 +260,7 @@  _DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
 
 static int
 _DEFUN(get_mb_cur_max, (data),
-                       _VOID_PTR data)
+                       void *data)
 {
   return UTF8_MB_CUR_MAX;
 }
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 1f4f70ffc..7c932e65c 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -163,7 +163,7 @@  _DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path),
 
   p = find_alias (rptr, ca, _iconv_aliases, strlen (_iconv_aliases));
   
-  _free_r (rptr, (_VOID_PTR)ca);
+  _free_r (rptr, (void *)ca);
   return p;
 }
 
diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
index f0088767e..59b6fe810 100644
--- a/newlib/libc/iconv/lib/conv.h
+++ b/newlib/libc/iconv/lib/conv.h
@@ -63,7 +63,7 @@  typedef struct
    *   Pointer to conversion-specific data if success. In case of error
    *   returns NULL and sets current thread's/process's errno.
    */
-  _VOID_PTR _EXFNPTR(open, (struct _reent *rptr,
+  void *_EXFNPTR(open, (struct _reent *rptr,
                           const char *to,
                           const char *from));
   
@@ -72,7 +72,7 @@  typedef struct
    *
    * PARAMETRS:
    *   struct _reent *rptr - reent structure of current thread/process;
-   *   _VOID_PTR data      - conversion-specific data.
+   *   void *data      - conversion-specific data.
    *
    * DESCRIPTION:
    *   This function is called from iconv_close() to close conversion.
@@ -82,13 +82,13 @@  typedef struct
    *   thread's/process's errno and returns (size_t)-1 (same as iconv_open()).
    */
   size_t _EXFNPTR(close, (struct _reent *rptr,
-                        _VOID_PTR data));
+                        void *data));
   
   /* convert - perform encoding conversion.
    *
    * PARAMETERS:
    *   struct _reent *rptr - reent structure of current thread/process.
-   *   _VOID_PTR data      - conversion-specific data;
+   *   void *data      - conversion-specific data;
    *   const unsigned char **inbuf - input data buffer;
    *   size_t *inbytesleft          - input buffer's length;
    *   unsigned char **outbuf       - output data buffer;
@@ -115,7 +115,7 @@  typedef struct
    *   thread's/process's errno and returns (size_t)-1 (same as iconv()).
    */
   size_t _EXFNPTR(convert, (struct _reent *rptr,
-                           _VOID_PTR data,
+                           void *data,
                            const unsigned char **inbuf,
                            size_t *inbytesleft,
                            unsigned char **outbuf,
@@ -126,7 +126,7 @@  typedef struct
    * get_state - get current shift state.
    *
    * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
+   *   void *data   - conversion-specific data;
    *   mbstate_t *state - mbstate_t object where shift state will be written;
    *   int direction      - 0-"from", 1-"to".
    *
@@ -135,7 +135,7 @@  typedef struct
    *   If 'direction' is 0, "from" encoding is tested, else
    *   "to" encoding is tested.
    */
-  _VOID _EXFNPTR(get_state, (_VOID_PTR data,
+  _VOID _EXFNPTR(get_state, (void *data,
                            mbstate_t *state,
                            int direction));
 
@@ -143,7 +143,7 @@  typedef struct
    * set_state - set shift state.
    *
    * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
+   *   void *data   - conversion-specific data;
    *   mbstate_t *state - mbstate_t object to which shift state will be set.
    *   int direction     - 0-"from", 1-"to".
    *
@@ -154,7 +154,7 @@  typedef struct
    *   "to" encoding is set.
    *   Returns 0 if '*state' object has right format, -1 else.
    */
-  int _EXFNPTR(set_state, (_VOID_PTR data,
+  int _EXFNPTR(set_state, (void *data,
                          mbstate_t *state,
                          int direction));
   
@@ -162,7 +162,7 @@  typedef struct
    * get_mb_cur_max - get maximum character length in bytes.
    *
    * PARAMETERS:
-   *   _VOID_PTR data     - conversion-specific data;
+   *   void *data     - conversion-specific data;
    *   int direction      - 0-"from", 1-"to".
    *
    * DESCRIPTION:
@@ -170,14 +170,14 @@  typedef struct
    *   If 'direction' is 0, "from" encoding is tested, else
    *   "to" encoding is tested.
    */
-  int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data,
+  int _EXFNPTR(get_mb_cur_max, (void *data,
                               int direction));
   
   /*
    * is_stateful - is encoding stateful or stateless.
    *
    * PARAMETERS:
-   *   _VOID_PTR data - conversion-specific data;
+   *   void *data - conversion-specific data;
    *   int direction  - 0-"from", 1-"to".
    *
    * DESCRIPTION:
@@ -185,7 +185,7 @@  typedef struct
    *   If 'direction' is 0, "from" encoding is tested, else
    *   "to" encoding is tested.
    */
-  int _EXFNPTR(is_stateful, (_VOID_PTR data,
+  int _EXFNPTR(is_stateful, (void *data,
                            int direction));
   
 } iconv_conversion_handlers_t;
@@ -205,7 +205,7 @@  typedef struct
    * Conversion-specific data (e.g., points to iconv_ucs_conversion_t
    * object if UCS-based conversion is used).
    */
-  _VOID_PTR data;
+  void *data;
 } iconv_conversion_t;
 
 
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index 7c9b252f3..0cf3cf5ff 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -165,7 +165,7 @@  _DEFUN(_iconv_open_r, (rptr, to, from),
 
   if ((from = (const char *)_iconv_resolve_encoding_name (rptr, from)) == NULL)
     {
-      _free_r (rptr, (_VOID_PTR)to);
+      _free_r (rptr, (void *)to);
       return (iconv_t)-1;
     }
 
@@ -187,16 +187,16 @@  _DEFUN(_iconv_open_r, (rptr, to, from),
       ic->data = ic->handlers->open (rptr, to, from);
     }
 
-  _free_r (rptr, (_VOID_PTR)to);
-  _free_r (rptr, (_VOID_PTR)from);
+  _free_r (rptr, (void *)to);
+  _free_r (rptr, (void *)from);
 
   if (ic->data == NULL)
     {
-      _free_r (rptr, (_VOID_PTR)ic);
+      _free_r (rptr, (void *)ic);
       return (iconv_t)-1;
     }
 
-  return (_VOID_PTR)ic;
+  return (void *)ic;
 }
 
 
@@ -211,7 +211,7 @@  _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
 {
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
 
-  if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
+  if ((void *)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
        || (ic->handlers != &_iconv_null_conversion_handlers
            && ic->handlers != &_iconv_ucs_conversion_handlers))
     {
@@ -249,7 +249,7 @@  _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
           
           if (*outbytesleft >= state_null.__count)
             {
-              memcpy ((_VOID_PTR)(*outbuf), (_VOID_PTR)&state_null, state_null.__count);
+              memcpy ((void *)(*outbuf), (void *)&state_null, state_null.__count);
               
               *outbuf += state_null.__count;
               *outbytesleft -= state_null.__count;
@@ -295,7 +295,7 @@  _DEFUN(_iconv_close_r, (rptr, cd),
   int res;
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
   
-  if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
+  if ((void *)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
        || (ic->handlers != &_iconv_null_conversion_handlers
            && ic->handlers != &_iconv_ucs_conversion_handlers))
     {
@@ -305,7 +305,7 @@  _DEFUN(_iconv_close_r, (rptr, cd),
 
   res = (int)ic->handlers->close (rptr, ic->data);
   
-  _free_r (rptr, (_VOID_PTR)cd);
+  _free_r (rptr, (void *)cd);
 
   return res;
 }
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index fa35cca1a..1996bdd8f 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -177,7 +177,7 @@  _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
   iconv_conversion_t *ic = (iconv_conversion_t *)cd;
   int flags = ICONV_FAIL_BIT;
 
-  if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
+  if ((void *)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
        || (ic->handlers != &_iconv_null_conversion_handlers
            && ic->handlers != &_iconv_ucs_conversion_handlers))
     {
@@ -289,11 +289,11 @@  _DEFUN(iconv_open1, (rptr, to, from),
 
   if (ic->data == NULL)
     {
-      _free_r (rptr, (_VOID_PTR)ic);
+      _free_r (rptr, (void *)ic);
       return (iconv_t)-1;
     }
 
-  return (_VOID_PTR)ic;
+  return (void *)ic;
 }
 
 /*
diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h
index 46428ae17..bd9dcddca 100644
--- a/newlib/libc/iconv/lib/local.h
+++ b/newlib/libc/iconv/lib/local.h
@@ -30,9 +30,6 @@ 
 #include <sys/types.h>
 #include <limits.h>
 
-/* void* type for K&R compilers compatibility */
-#define _VOID_PTR _PTR
-
 /* Encodings aliases file */
 #define ICONV_ALIASES_FNAME   "encoding.aliases"
 /* iconv CCS data path */
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 729007ab0..3c87cbb83 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -35,20 +35,20 @@ 
 static int null_conversion_dummy_data;
 
 
-static _VOID_PTR
+static void *
 _DEFUN(null_conversion_open, (rptr, to, from),
                              struct _reent *rptr,
                              const char *to,
                              const char *from)
 {
-  return (_VOID_PTR)&null_conversion_dummy_data;
+  return (void *)&null_conversion_dummy_data;
 }
 
 
 static size_t
 _DEFUN(null_conversion_close, (rptr, data),
                               struct _reent *rptr,
-                              _VOID_PTR data)
+                              void *data)
 {
   return 0;
 }
@@ -58,7 +58,7 @@  static size_t
 _DEFUN(null_conversion_convert,
                      (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
                      struct _reent *rptr,
-                     _VOID_PTR data,
+                     void *data,
                      const unsigned char **inbuf,
                      size_t *inbytesleft,
                      unsigned char **outbuf,
@@ -94,7 +94,7 @@  _DEFUN(null_conversion_convert,
 
 static int
 _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
-                                       _VOID_PTR data,
+                                       void *data,
                                        int direction)
 {
   return ICONV_MB_LEN_MAX;
@@ -103,7 +103,7 @@  _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
 
 static _VOID
 _DEFUN(null_conversion_get_state, (data, state, size),
-                                  _VOID_PTR data,
+                                  void *data,
                                   mbstate_t *state,
                                   int direction)
 {
@@ -113,7 +113,7 @@  _DEFUN(null_conversion_get_state, (data, state, size),
 
 static int
 _DEFUN(null_conversion_set_state, (data, state, direction),
-                                  _VOID_PTR data,
+                                  void *data,
                                   mbstate_t *state,
                                   int direction)
 {
@@ -122,7 +122,7 @@  _DEFUN(null_conversion_set_state, (data, state, direction),
 
 static int
 _DEFUN(null_conversion_is_stateful, (data, direction),
-                                    _VOID_PTR data,
+                                    void *data,
                                     int direction)
 {
   return 0;
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index 7cc65c86c..c91007209 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -44,7 +44,7 @@  _EXFUN(find_encoding_name, (const char *searchee,
  * UCS-based conversion interface functions implementation.
  */
 
-static _VOID_PTR
+static void *
 _DEFUN(ucs_based_conversion_open, (rptr, to, from),
                                   struct _reent *rptr,
                                   const char *to,
@@ -97,7 +97,7 @@  _DEFUN(ucs_based_conversion_open, (rptr, to, from),
         goto error;
     }
   else
-    uc->to_ucs.data = (_VOID_PTR)&fake_data;
+    uc->to_ucs.data = (void *)&fake_data;
     
 
   /* Initialize "from UCS" CES converter */
@@ -108,7 +108,7 @@  _DEFUN(ucs_based_conversion_open, (rptr, to, from),
         goto error;
     }
   else
-    uc->from_ucs.data = (_VOID_PTR)&fake_data;
+    uc->from_ucs.data = (void *)&fake_data;
 
   return uc;
 
@@ -116,7 +116,7 @@  error:
   if (uc->to_ucs.data != NULL && uc->to_ucs.handlers->close != NULL)
     uc->to_ucs.handlers->close (rptr, uc->to_ucs.data);
 
-  _free_r (rptr, (_VOID_PTR)uc);
+  _free_r (rptr, (void *)uc);
 
   return NULL;
 }
@@ -125,7 +125,7 @@  error:
 static size_t
 _DEFUN(ucs_based_conversion_close, (rptr, data),
                                    struct _reent *rptr,
-                                   _VOID_PTR data)
+                                   void *data)
 {
   iconv_ucs_conversion_t *uc;
   size_t res = 0;
@@ -137,7 +137,7 @@  _DEFUN(ucs_based_conversion_close, (rptr, data),
   if (uc->to_ucs.handlers->close != NULL)
     res |= uc->to_ucs.handlers->close (rptr, uc->to_ucs.data);
 
-  _free_r (rptr, (_VOID_PTR)data);
+  _free_r (rptr, (void *)data);
 
   return res;
 }
@@ -147,7 +147,7 @@  static size_t
 _DEFUN(ucs_based_conversion_convert,
                  (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
                  struct _reent *rptr,
-                 _VOID_PTR data,
+                 void *data,
                  const unsigned char **inbuf,
                  size_t *inbytesleft,
                  unsigned char **outbuf,
@@ -239,7 +239,7 @@  _DEFUN(ucs_based_conversion_convert,
 
 static int
 _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
-                                            _VOID_PTR data,
+                                            void *data,
                                             int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -253,7 +253,7 @@  _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
 
 static _VOID
 _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
-                                       _VOID_PTR data,
+                                       void *data,
                                        mbstate_t *state,
                                        int direction)
 {
@@ -281,7 +281,7 @@  _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
 
 static int
 _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
-                                       _VOID_PTR data,
+                                       void *data,
                                        mbstate_t *state,
                                        int direction)
 {
@@ -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,
+                                         void *data,
                                          int direction)
 {
   iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
index cea6d5aa3..d3333161c 100644
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ b/newlib/libc/iconv/lib/ucsconv.h
@@ -68,7 +68,7 @@  typedef struct
    *   Returns CES-specific data pointer if success. In case of error returns
    *   NULL and sets current thread's/process's errno.
    */
-  _VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
+  void *_EXFNPTR(init, (struct _reent *rptr,
                           const char *encoding));
 
   /*
@@ -76,7 +76,7 @@  typedef struct
    *
    * PARAMETERS:
    *   struct _reent *rptr - reent structure of current thread/process;
-   *   _VOID_PTR data      - CES converter-specific data.
+   *   void *data      - CES converter-specific data.
    *
    * DESCRIPTION:
    *     Preforms CES converter closing.   *
@@ -85,37 +85,37 @@  typedef struct
    *   sets current thread's/process's errno.
    */
   size_t _EXFNPTR(close, (struct _reent *rptr,
-                        _VOID_PTR data));
+                        void *data));
 
   /*
    * get_mb_cur_max - get maximum character length in bytes.
    *
    * PARAMETERS:
-   *   _VOID_PTR data     - conversion-specific data;
+   *   void *data     - conversion-specific data;
    *
    * DESCRIPTION:
    *   Returns encoding's maximum character length.
    */
-  int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data));
+  int _EXFNPTR(get_mb_cur_max, (void *data));
   
   /*
    * get_state - get current shift state.
    *
    * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
+   *   void *data   - conversion-specific data;
    *   mbstate_t *state - mbstate_t object where shift state will be stored;
    *
    * DESCRIPTION:
    *   Returns encoding's current shift sequence.
    */
-  _VOID _EXFNPTR(get_state, (_VOID_PTR data,
+  _VOID _EXFNPTR(get_state, (void *data,
                            mbstate_t *state));
 
   /*
    * set_state - set shift state.
    *
    * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
+   *   void *data   - conversion-specific data;
    *   mbstate_t *state - mbstate_t value to which shift state will be set.
    *
    * DESCRIPTION:
@@ -123,25 +123,25 @@  typedef struct
    *   object is zero-object - reset current shift state.
    *   Returns 0 if '*state' object has right format, -1 else.
    */
-  int _EXFNPTR(set_state, (_VOID_PTR data,
+  int _EXFNPTR(set_state, (void *data,
                          mbstate_t *state));
 
   /*
    * is_stateful - is encoding stateful state.
    *
    * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
+   *   void *data   - conversion-specific data;
    *
    * DESCRIPTION:
    *   Returns 0 if encoding is stateless, else returns 1.
    */
-  int _EXFNPTR(is_stateful, (_VOID_PTR data));
+  int _EXFNPTR(is_stateful, (void *data));
   
   /*
    * convert_to_ucs - convert character to UCS.
    *
    * PARAMETERS:
-   *   _VOID_PTR data               - CES converter-specific data;
+   *   void *data               - CES converter-specific data;
    *   const unsigned char **inbuf - buffer with input character byte sequence;
    *   size_t *inbytesleft          - output buffer bytes count.
    *
@@ -155,7 +155,7 @@  typedef struct
    *   returns ICONV_CES_INVALID_CHARACTER. If invalid or incomplete bytes
    *   sequence was met, returns ICONV_CES_BAD_SEQUENCE.
    */
-  ucs4_t _EXFNPTR(convert_to_ucs, (_VOID_PTR data,
+  ucs4_t _EXFNPTR(convert_to_ucs, (void *data,
                                  const unsigned char **inbuf,
                                  size_t *inbytesleft));
 } iconv_to_ucs_ces_handlers_t;
@@ -172,32 +172,32 @@  typedef struct
 typedef struct
 {
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  _VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
+  void *_EXFNPTR(init, (struct _reent *rptr,
                           const char *encoding));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
   size_t _EXFNPTR(close, (struct _reent *rptr,
-                        _VOID_PTR data));
+                        void *data));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data));
+  int _EXFNPTR(get_mb_cur_max, (void *data));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  _VOID _EXFNPTR(get_state, (_VOID_PTR data,
+  _VOID _EXFNPTR(get_state, (void *data,
                            mbstate_t *state));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXFNPTR(set_state, (_VOID_PTR data,
+  int _EXFNPTR(set_state, (void *data,
                          mbstate_t *state));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXFNPTR(is_stateful, (_VOID_PTR data));
+  int _EXFNPTR(is_stateful, (void *data));
   
   /*
    * convert_from_ucs - convert UCS character to destination encoding.
    *
    * PARAMETERS:
-   *   _VOID_PTR data         - CES converter-specific data;
+   *   void *data         - CES converter-specific data;
    *   ucs4_t in              - input UCS-4 character;
    *   unsigned char **outbuf - output buffer for the result;
    *   size_t *outbytesleft   - output buffer bytes count.
@@ -215,7 +215,7 @@  typedef struct
    *   If there is no corresponding character in destination encoding, returns
    *   ICONV_CES_INVALID_CHARACTER.
    */
-  size_t _EXFNPTR(convert_from_ucs, (_VOID_PTR data,
+  size_t _EXFNPTR(convert_from_ucs, (void *data,
                                    ucs4_t in,
                                    unsigned char **outbuf,
                                    size_t *outbytesleft));
@@ -234,7 +234,7 @@  typedef struct
   const iconv_to_ucs_ces_handlers_t *handlers;
   
   /* "to_ucs" CES converter-specific data. */
-  _VOID_PTR data;
+  void *data;
 } iconv_to_ucs_ces_desc_t;
 
 
@@ -250,7 +250,7 @@  typedef struct
   const iconv_from_ucs_ces_handlers_t *handlers;
   
   /* "from_ucs" CES converter-specific data. */
-  _VOID_PTR data;
+  void *data;
 } iconv_from_ucs_ces_desc_t;