[v2,10/17] ansification: remove _VOID

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

Commit Message

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

---
 libgloss/bfin/_exit.c                        |  2 +-
 libgloss/libnosys/_exit.c                    |  2 +-
 newlib/libc/iconv/lib/conv.h                 |  2 +-
 newlib/libc/iconv/lib/iconvnls.c             |  2 +-
 newlib/libc/iconv/lib/nullconv.c             |  2 +-
 newlib/libc/iconv/lib/ucsconv.c              |  2 +-
 newlib/libc/iconv/lib/ucsconv.h              |  4 +--
 newlib/libc/include/_ansi.h                  |  2 --
 newlib/libc/include/malloc.h                 |  8 ++---
 newlib/libc/include/stdio.h                  |  2 +-
 newlib/libc/include/stdlib.h                 | 54 ++++++++++++++--------------
 newlib/libc/include/sys/iconvnls.h           |  2 +-
 newlib/libc/include/sys/reent.h              |  2 +-
 newlib/libc/include/time.h                   |  8 ++---
 newlib/libc/machine/microblaze/abort.c       |  2 +-
 newlib/libc/machine/nds32/abort.c            |  2 +-
 newlib/libc/machine/powerpc/machine/malloc.h |  2 +-
 newlib/libc/machine/powerpc/machine/stdlib.h |  2 +-
 newlib/libc/machine/spu/clearerr.c           |  2 +-
 newlib/libc/machine/spu/stdio.c              |  6 ++--
 newlib/libc/signal/psignal.c                 |  2 +-
 newlib/libc/stdio/clearerr.c                 |  2 +-
 newlib/libc/stdio/clearerr_u.c               |  2 +-
 newlib/libc/stdio/findfp.c                   | 22 ++++++------
 newlib/libc/stdio/local.h                    | 14 ++++----
 newlib/libc/stdio/makebuf.c                  |  2 +-
 newlib/libc/stdio/perror.c                   |  4 +--
 newlib/libc/stdio/rewind.c                   |  4 +--
 newlib/libc/stdio/setbuf.c                   |  2 +-
 newlib/libc/stdio/setbuffer.c                |  2 +-
 newlib/libc/stdlib/abort.c                   |  2 +-
 newlib/libc/stdlib/atexit.c                  |  2 +-
 newlib/libc/stdlib/lcong48.c                 |  4 +--
 newlib/libc/stdlib/on_exit.c                 |  2 +-
 newlib/libc/stdlib/srand48.c                 |  4 +--
 newlib/libc/sys/linux/include/time.h         |  8 ++---
 newlib/libc/sys/rtems/crt0.c                 |  2 +-
 newlib/libc/time/local.h                     |  8 ++---
 newlib/libc/time/tzlock.c                    |  4 +--
 newlib/libc/time/tzset.c                     |  4 +--
 newlib/libc/time/tzset_r.c                   |  4 +--
 41 files changed, 104 insertions(+), 106 deletions(-)

-- 
2.15.1

Patch

diff --git a/libgloss/bfin/_exit.c b/libgloss/bfin/_exit.c
index d7fb9e033..e8186326a 100644
--- a/libgloss/bfin/_exit.c
+++ b/libgloss/bfin/_exit.c
@@ -16,7 +16,7 @@ 
 
 #include <_ansi.h>
 
-_VOID
+void
 _DEFUN (_exit, (rc),
 	int rc)
 {
diff --git a/libgloss/libnosys/_exit.c b/libgloss/libnosys/_exit.c
index 3fdf7f081..44d845b8c 100644
--- a/libgloss/libnosys/_exit.c
+++ b/libgloss/libnosys/_exit.c
@@ -5,7 +5,7 @@ 
 #include <_ansi.h>
 #include <_syslist.h>
 
-_VOID
+void
 _DEFUN (_exit, (rc),
 	int rc)
 {
diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
index 59b6fe810..89da4b224 100644
--- a/newlib/libc/iconv/lib/conv.h
+++ b/newlib/libc/iconv/lib/conv.h
@@ -135,7 +135,7 @@  typedef struct
    *   If 'direction' is 0, "from" encoding is tested, else
    *   "to" encoding is tested.
    */
-  _VOID _EXFNPTR(get_state, (void *data,
+  void _EXFNPTR(get_state, (void *data,
                            mbstate_t *state,
                            int direction));
 
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index 1996bdd8f..dfb6a18dd 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -219,7 +219,7 @@  _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
  *    shift state if 'direction' is 0 and "to" encodings's shift state
  *    if 'direction' isn't 0.
  */
-_VOID
+void
 _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
                              iconv_t cd,
                              mbstate_t *ps,
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 3c87cbb83..8040c24e7 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -101,7 +101,7 @@  _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
 }
 
 
-static _VOID
+static void
 _DEFUN(null_conversion_get_state, (data, state, size),
                                   void *data,
                                   mbstate_t *state,
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index c91007209..f480aee63 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -251,7 +251,7 @@  _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
 }
 
 
-static _VOID
+static void
 _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
                                        void *data,
                                        mbstate_t *state,
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
index d3333161c..391daed35 100644
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ b/newlib/libc/iconv/lib/ucsconv.h
@@ -108,7 +108,7 @@  typedef struct
    * DESCRIPTION:
    *   Returns encoding's current shift sequence.
    */
-  _VOID _EXFNPTR(get_state, (void *data,
+  void _EXFNPTR(get_state, (void *data,
                            mbstate_t *state));
 
   /*
@@ -183,7 +183,7 @@  typedef struct
   int _EXFNPTR(get_mb_cur_max, (void *data));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
-  _VOID _EXFNPTR(get_state, (void *data,
+  void _EXFNPTR(get_state, (void *data,
                            mbstate_t *state));
 
   /* Same as in iconv_to_ucs_ces_handlers_t */
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index b8d27b24e..9c3a04695 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -49,7 +49,6 @@ 
 #ifdef _HAVE_STDC
 #define	_VOLATILE	volatile
 #define	_SIGNED		signed
-#define _VOID void
 #ifdef __CYGWIN__
 #define	_EXFUN_NOTHROW(name, proto)	__cdecl name proto _NOTHROW
 #define	_EXFUN(name, proto)		__cdecl name proto
@@ -68,7 +67,6 @@ 
 #else	
 #define	_VOLATILE
 #define	_SIGNED
-#define _VOID void
 #define	_EXFUN(name, proto)		name()
 #define	_EXFUN_NOTHROW(name, proto)	name()
 #define	_DEFUN(name, arglist, args)	name arglist args;
diff --git a/newlib/libc/include/malloc.h b/newlib/libc/include/malloc.h
index f9144cdca..e12a13244 100644
--- a/newlib/libc/include/malloc.h
+++ b/newlib/libc/include/malloc.h
@@ -42,12 +42,12 @@  extern void *malloc (size_t);
 extern void *_malloc_r (struct _reent *, size_t);
 #endif
 
-extern _VOID free (void *);
+extern void free (void *);
 #ifdef __CYGWIN__
 #undef _free_r
 #define _free_r(r, p) free (p)
 #else
-extern _VOID _free_r (struct _reent *, void *);
+extern void _free_r (struct _reent *, void *);
 #endif
 
 extern void *realloc (void *, size_t);
@@ -135,12 +135,12 @@  extern int _malloc_trim_r (struct _reent *, size_t);
 
 /* A compatibility routine for an earlier version of the allocator.  */
 
-extern _VOID mstats (char *);
+extern void mstats (char *);
 #ifdef __CYGWIN__
 #undef _mstats_r
 #define _mstats_r(r, p) mstats (p)
 #else
-extern _VOID _mstats_r (struct _reent *, char *);
+extern void _mstats_r (struct _reent *, char *);
 #endif
 
 /* SVID2/XPG mallopt options */
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index fe0a31827..127145083 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -259,7 +259,7 @@  off_t	_EXFUN(ftello, ( FILE *));
 #endif
 #endif
 #if __GNU_VISIBLE
-int	_EXFUN(fcloseall, (_VOID));
+int	_EXFUN(fcloseall, (void));
 #endif
 #ifndef _REENT_ONLY
 #if __ISO_C_VISIBLE >= 1999
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index 7213a3c16..80f15f4e9 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -62,18 +62,18 @@  typedef int (*__compar_fn_t) (const void *, const void *);
 
 #define RAND_MAX __RAND_MAX
 
-int	_EXFUN(__locale_mb_cur_max,(_VOID));
+int	_EXFUN(__locale_mb_cur_max,(void));
 
 #define MB_CUR_MAX __locale_mb_cur_max()
 
-_VOID	_EXFUN(abort,(_VOID) _ATTRIBUTE ((__noreturn__)));
+void	_EXFUN(abort,(void) _ATTRIBUTE ((__noreturn__)));
 int	_EXFUN(abs,(int));
 #if __BSD_VISIBLE
 __uint32_t _EXFUN(arc4random, (void));
 __uint32_t _EXFUN(arc4random_uniform, (__uint32_t));
 void    _EXFUN(arc4random_buf, (void *, size_t));
 #endif
-int	_EXFUN(atexit,(_VOID (*__func)(_VOID)));
+int	_EXFUN(atexit,(void (*__func)(void)));
 double	_EXFUN(atof,(const char *__nptr));
 #if __MISC_VISIBLE
 float	_EXFUN(atoff,(const char *__nptr));
@@ -89,8 +89,8 @@  void *	_EXFUN(bsearch,(const void *__key,
 		       __compar_fn_t _compar));
 void *	_EXFUN_NOTHROW(calloc,(size_t __nmemb, size_t __size));
 div_t	_EXFUN(div,(int __numer, int __denom));
-_VOID	_EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
-_VOID	_EXFUN_NOTHROW(free,(void *));
+void	_EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
+void	_EXFUN_NOTHROW(free,(void *));
 char *  _EXFUN(getenv,(const char *__string));
 char *	_EXFUN(_getenv_r,(struct _reent *, const char *__string));
 char *	_EXFUN(_findenv,(const char *, int *));
@@ -136,8 +136,8 @@  int	_EXFUN(_mkostemps_r, (struct _reent *, char *, int, int));
 int	_EXFUN(_mkstemp_r, (struct _reent *, char *));
 int	_EXFUN(_mkstemps_r, (struct _reent *, char *, int));
 char *	_EXFUN(_mktemp_r, (struct _reent *, char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead"))));
-_VOID	_EXFUN(qsort,(void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar));
-int	_EXFUN(rand,(_VOID));
+void	_EXFUN(qsort,(void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar));
+int	_EXFUN(rand,(void));
 void *	_EXFUN_NOTHROW(realloc,(void *__r, size_t __size));
 #if __BSD_VISIBLE
 void	*reallocarray(void *, size_t, size_t) __result_use_check __alloc_size(2)
@@ -151,9 +151,9 @@  char *	_EXFUN(realpath, (const char *__restrict path, char *__restrict resolved_
 int	_EXFUN(rpmatch, (const char *response));
 #endif
 #if __XSI_VISIBLE
-_VOID	_EXFUN(setkey, (const char *__key));
+void	_EXFUN(setkey, (const char *__key));
 #endif
-_VOID	_EXFUN(srand,(unsigned __seed));
+void	_EXFUN(srand,(unsigned __seed));
 double	_EXFUN(strtod,(const char *__restrict __n, char **__restrict __end_PTR));
 double	_EXFUN(_strtod_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR));
 #if __ISO_C_VISIBLE >= 1999
@@ -193,10 +193,10 @@  char *  _EXFUN(l64a,(long __input));
 char *  _EXFUN(_l64a_r,(struct _reent *,long __input));
 #endif
 #if __MISC_VISIBLE
-int	_EXFUN(on_exit,(_VOID (*__func)(int, void *),void *__arg));
+int	_EXFUN(on_exit,(void (*__func)(int, void *),void *__arg));
 #endif
 #if __ISO_C_VISIBLE >= 1999
-_VOID	_EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__)));
+void	_EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__)));
 #endif
 #if __SVID_VISIBLE || __XSI_VISIBLE
 int	_EXFUN(putenv,(char *__string));
@@ -229,17 +229,17 @@  int	_EXFUN(rand_r,(unsigned *__seed));
 #endif
 
 #if __SVID_VISIBLE || __XSI_VISIBLE
-double _EXFUN(drand48,(_VOID));
+double _EXFUN(drand48,(void));
 double _EXFUN(_drand48_r,(struct _reent *));
 double _EXFUN(erand48,(unsigned short [3]));
 double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
 long   _EXFUN(jrand48,(unsigned short [3]));
 long   _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
-_VOID  _EXFUN(lcong48,(unsigned short [7]));
-_VOID  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
-long   _EXFUN(lrand48,(_VOID));
+void  _EXFUN(lcong48,(unsigned short [7]));
+void  _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
+long   _EXFUN(lrand48,(void));
 long   _EXFUN(_lrand48_r,(struct _reent *));
-long   _EXFUN(mrand48,(_VOID));
+long   _EXFUN(mrand48,(void));
 long   _EXFUN(_mrand48_r,(struct _reent *));
 long   _EXFUN(nrand48,(unsigned short [3]));
 long   _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
@@ -247,14 +247,14 @@  unsigned short *
        _EXFUN(seed48,(unsigned short [3]));
 unsigned short *
        _EXFUN(_seed48_r,(struct _reent *, unsigned short [3]));
-_VOID  _EXFUN(srand48,(long));
-_VOID  _EXFUN(_srand48_r,(struct _reent *, long));
+void  _EXFUN(srand48,(long));
+void  _EXFUN(_srand48_r,(struct _reent *, long));
 #endif /* __SVID_VISIBLE || __XSI_VISIBLE */
 #if __SVID_VISIBLE || __XSI_VISIBLE >= 4 || __BSD_VISIBLE
 char *	_EXFUN(initstate,(unsigned, char *, size_t));
-long	_EXFUN(random,(_VOID));
+long	_EXFUN(random,(void));
 char *	_EXFUN(setstate,(char *));
-_VOID	_EXFUN(srandom,(unsigned));
+void	_EXFUN(srandom,(unsigned));
 #endif
 #if __ISO_C_VISIBLE >= 1999
 long long _EXFUN(atoll,(const char *__nptr));
@@ -273,7 +273,7 @@  unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__restrict _
 
 #ifndef __CYGWIN__
 #if __MISC_VISIBLE
-_VOID	_EXFUN(cfree,(void *));
+void	_EXFUN(cfree,(void *));
 #endif
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
 int	_EXFUN(unsetenv,(const char *__string));
@@ -289,26 +289,26 @@  char *	_EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
 #ifndef __CYGWIN__
 void *	_EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
 void *	_EXFUN_NOTHROW(_calloc_r,(struct _reent *, size_t, size_t));
-_VOID	_EXFUN_NOTHROW(_free_r,(struct _reent *, void *));
+void	_EXFUN_NOTHROW(_free_r,(struct _reent *, void *));
 void *	_EXFUN_NOTHROW(_realloc_r,(struct _reent *, void *, size_t));
-_VOID	_EXFUN(_mstats_r,(struct _reent *, char *));
+void	_EXFUN(_mstats_r,(struct _reent *, char *));
 #endif
 int	_EXFUN(_system_r,(struct _reent *, const char *));
 
-_VOID	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
+void	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
 
 /* There are two common qsort_r variants.  If you request
    _BSD_SOURCE, you get the BSD version; otherwise you get the GNU
    version.  We want that #undef qsort_r will still let you
    invoke the underlying function, but that requires gcc support. */
 #if __GNU_VISIBLE
-_VOID	_EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk));
+void	_EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk));
 #elif __BSD_VISIBLE
 # ifdef __GNUC__
-_VOID	_EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)))
+void	_EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)))
              __asm__ (__ASMNAME ("__bsd_qsort_r"));
 # else
-_VOID	_EXFUN(__bsd_qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)));
+void	_EXFUN(__bsd_qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)));
 #  define qsort_r __bsd_qsort_r
 # endif
 #endif
diff --git a/newlib/libc/include/sys/iconvnls.h b/newlib/libc/include/sys/iconvnls.h
index 7475ed21b..aa0b78441 100644
--- a/newlib/libc/include/sys/iconvnls.h
+++ b/newlib/libc/include/sys/iconvnls.h
@@ -44,7 +44,7 @@ 
 #define ICONV_NLS_FROM 0
 #define ICONV_NLS_TO   1
 
-_VOID
+void
 _EXFUN(_iconv_nls_get_state, (iconv_t cd, mbstate_t *ps, int direction));
 
 int
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 1381db67b..cfb79edd3 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -165,7 +165,7 @@  struct __sFILE_fake {
 /* Following is needed both in libc/stdio and libc/stdlib so we put it
  * here instead of libc/stdio/local.h where it was previously. */
 
-extern _VOID   _EXFUN(__sinit,(struct _reent *));
+extern void   _EXFUN(__sinit,(struct _reent *));
 
 # define _REENT_SMALL_CHECK_INIT(ptr)		\
   do						\
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 8806b98c7..6f6ff86c8 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -98,9 +98,9 @@  char *strptime_l (const char *__restrict, const char *__restrict,
 #endif
 
 #if __POSIX_VISIBLE
-_VOID      _EXFUN(tzset,	(_VOID));
+void      _EXFUN(tzset,	(void));
 #endif
-_VOID      _EXFUN(_tzset_r,	(struct _reent *));
+void      _EXFUN(_tzset_r,	(struct _reent *));
 
 typedef struct __tzrule_struct
 {
@@ -120,7 +120,7 @@  typedef struct __tzinfo_struct
   __tzrule_type __tzrule[2];
 } __tzinfo_type;
 
-__tzinfo_type *_EXFUN (__gettzinfo, (_VOID));
+__tzinfo_type *_EXFUN (__gettzinfo, (void));
 
 /* getdate functions */
 
@@ -128,7 +128,7 @@  __tzinfo_type *_EXFUN (__gettzinfo, (_VOID));
 #if __XSI_VISIBLE >= 4
 #ifndef _REENT_ONLY
 #define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(_VOID));
+int *_EXFUN(__getdate_err,(void));
 
 struct tm *	_EXFUN(getdate, (const char *));
 /* getdate_err is set to one of the following values to indicate the error.
diff --git a/newlib/libc/machine/microblaze/abort.c b/newlib/libc/machine/microblaze/abort.c
index a2bb535e0..1af7b368f 100644
--- a/newlib/libc/machine/microblaze/abort.c
+++ b/newlib/libc/machine/microblaze/abort.c
@@ -46,7 +46,7 @@  Supporting OS subroutines required: <<_exit>> and optionally, <<write>>.
 #include <unistd.h>
 #include <signal.h>
 
-_VOID
+void
 abort (void)
 {
 #ifdef ABORT_MESSAGE
diff --git a/newlib/libc/machine/nds32/abort.c b/newlib/libc/machine/nds32/abort.c
index c952ce569..5fa0b6e7f 100644
--- a/newlib/libc/machine/nds32/abort.c
+++ b/newlib/libc/machine/nds32/abort.c
@@ -28,7 +28,7 @@  Supporting OS subroutines required: <<_exit>>.
 
 #include <unistd.h>
 
-_VOID
+void
 abort (void)
 {
   while (1)
diff --git a/newlib/libc/machine/powerpc/machine/malloc.h b/newlib/libc/machine/powerpc/machine/malloc.h
index 6be7eac80..394ad4e4e 100644
--- a/newlib/libc/machine/powerpc/machine/malloc.h
+++ b/newlib/libc/machine/powerpc/machine/malloc.h
@@ -5,7 +5,7 @@ 
 
 void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
 void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-_VOID   _EXFUN(vec_free,(void *));
+void   _EXFUN(vec_free,(void *));
 #define _vec_freer _freer
 void *_EXFUN(vec_malloc,(size_t __size));
 #define _vec_mallocr _memalign_r
diff --git a/newlib/libc/machine/powerpc/machine/stdlib.h b/newlib/libc/machine/powerpc/machine/stdlib.h
index bc9b9cfe9..ea597102b 100644
--- a/newlib/libc/machine/powerpc/machine/stdlib.h
+++ b/newlib/libc/machine/powerpc/machine/stdlib.h
@@ -7,7 +7,7 @@ 
 
 void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
 void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-_VOID   _EXFUN(vec_free,(void *));
+void   _EXFUN(vec_free,(void *));
 #define _vec_freer _freer
 void *_EXFUN(vec_malloc,(size_t __size));
 #define _vec_mallocr _memalign_r
diff --git a/newlib/libc/machine/spu/clearerr.c b/newlib/libc/machine/spu/clearerr.c
index b4034f8ff..667667a91 100644
--- a/newlib/libc/machine/spu/clearerr.c
+++ b/newlib/libc/machine/spu/clearerr.c
@@ -36,7 +36,7 @@  Author: Joel Schopp <jschopp@austin.ibm.com>
 
 #ifndef _REENT_ONLY
 
-_VOID
+void
 _DEFUN (clearerr, (fp),
 	FILE * fp)
 
diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdio.c
index e8b9dd9fa..14332b475 100644
--- a/newlib/libc/machine/spu/stdio.c
+++ b/newlib/libc/machine/spu/stdio.c
@@ -52,7 +52,7 @@  _DEFUN (__sfp, (d),
   return NULL;
 }
 
-static _VOID
+static void
 _DEFUN (__cleanup, (s),
 	struct _reent *s)
 {
@@ -64,7 +64,7 @@  _DEFUN (__cleanup, (s),
   }
 }
 
-_VOID
+void
 _DEFUN (__sinit, (s),
 	struct _reent *s)
 {
@@ -81,7 +81,7 @@  _DEFUN (__sinit, (s),
   s->_stderr->_fp = SPE_STDERR;
 }
 
-_VOID
+void
 __check_init (void)
 {
     CHECK_INIT(_REENT);
diff --git a/newlib/libc/signal/psignal.c b/newlib/libc/signal/psignal.c
index 6263c3f70..a62f8ae01 100644
--- a/newlib/libc/signal/psignal.c
+++ b/newlib/libc/signal/psignal.c
@@ -33,7 +33,7 @@  Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <stdio.h>
 #include <string.h>
 
-_VOID
+void
 _DEFUN(psignal, (sig, s),
        int sig,
        const char *s)
diff --git a/newlib/libc/stdio/clearerr.c b/newlib/libc/stdio/clearerr.c
index 4174a7425..23e3c18e3 100644
--- a/newlib/libc/stdio/clearerr.c
+++ b/newlib/libc/stdio/clearerr.c
@@ -71,7 +71,7 @@  No supporting OS subroutines are required.
 
 #undef	clearerr
 
-_VOID
+void
 _DEFUN(clearerr, (fp),
        FILE * fp)
 {
diff --git a/newlib/libc/stdio/clearerr_u.c b/newlib/libc/stdio/clearerr_u.c
index 00c5e8efa..7514fa2e9 100644
--- a/newlib/libc/stdio/clearerr_u.c
+++ b/newlib/libc/stdio/clearerr_u.c
@@ -32,7 +32,7 @@ 
 
 #undef	clearerr_unlocked
 
-_VOID
+void
 _DEFUN(clearerr_unlocked, (fp),
        FILE * fp)
 {
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index fb437515d..031b98b49 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -40,9 +40,9 @@  __FILE __sf[3];
 #endif
 
 #if (defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED))
-_NOINLINE_STATIC _VOID
+_NOINLINE_STATIC void
 #else
-static _VOID
+static void
 #endif
 _DEFUN(std, (ptr, flags, file),
             FILE *ptr,
@@ -203,7 +203,7 @@  found:
  * The name `_cleanup' is, alas, fairly well known outside stdio.
  */
 
-_VOID
+void
 _DEFUN(_cleanup_r, (ptr),
        struct _reent *ptr)
 {
@@ -234,7 +234,7 @@  _DEFUN(_cleanup_r, (ptr),
 }
 
 #ifndef _REENT_ONLY
-_VOID
+void
 _cleanup (void)
 {
   _cleanup_r (_GLOBAL_REENT);
@@ -245,7 +245,7 @@  _cleanup (void)
  * __sinit() is called whenever stdio's internal variables must be set up.
  */
 
-_VOID
+void
 _DEFUN(__sinit, (s),
        struct _reent *s)
 {
@@ -303,25 +303,25 @@  _DEFUN(__sinit, (s),
 __LOCK_INIT_RECURSIVE(static, __sfp_recursive_mutex);
 __LOCK_INIT_RECURSIVE(static, __sinit_recursive_mutex);
 
-_VOID
+void
 __sfp_lock_acquire (void)
 {
   __lock_acquire_recursive (__sfp_recursive_mutex);
 }
 
-_VOID
+void
 __sfp_lock_release (void)
 {
   __lock_release_recursive (__sfp_recursive_mutex);
 }
 
-_VOID
+void
 __sinit_lock_acquire (void)
 {
   __lock_acquire_recursive (__sinit_recursive_mutex);
 }
 
-_VOID
+void
 __sinit_lock_release (void)
 {
   __lock_release_recursive (__sinit_recursive_mutex);
@@ -349,7 +349,7 @@  _DEFUN(__fp_unlock, (ptr),
   return 0;
 }
 
-_VOID
+void
 __fp_lock_all (void)
 {
   __sfp_lock_acquire ();
@@ -357,7 +357,7 @@  __fp_lock_all (void)
   (void) _fwalk (_REENT, __fp_lock);
 }
 
-_VOID
+void
 __fp_unlock_all (void)
 {
   (void) _fwalk (_REENT, __fp_unlock);
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index b5fd1198a..68a36e054 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -179,9 +179,9 @@  extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite,(struct _reent *, void *,
 extern _fpos_t _EXFUN(__sseek,(struct _reent *, void *, _fpos_t, int));
 extern int    _EXFUN(__sclose,(struct _reent *, void *));
 extern int    _EXFUN(__stextmode,(int));
-extern _VOID   _EXFUN(__sinit,(struct _reent *));
-extern _VOID   _EXFUN(_cleanup_r,(struct _reent *));
-extern _VOID   _EXFUN(__smakebuf_r,(struct _reent *, FILE *));
+extern void   _EXFUN(__sinit,(struct _reent *));
+extern void   _EXFUN(_cleanup_r,(struct _reent *));
+extern void   _EXFUN(__smakebuf_r,(struct _reent *, FILE *));
 extern int    _EXFUN(__swhatbuf_r,(struct _reent *, FILE *, size_t *, int *));
 extern int    _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
 extern int    _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
@@ -297,10 +297,10 @@  char *_EXFUN(_llicvt,(char *, long long, char));
 #define __sinit_lock_acquire()
 #define __sinit_lock_release()
 #else
-_VOID _EXFUN(__sfp_lock_acquire,(_VOID));
-_VOID _EXFUN(__sfp_lock_release,(_VOID));
-_VOID _EXFUN(__sinit_lock_acquire,(_VOID));
-_VOID _EXFUN(__sinit_lock_release,(_VOID));
+void _EXFUN(__sfp_lock_acquire,(void));
+void _EXFUN(__sfp_lock_release,(void));
+void _EXFUN(__sinit_lock_acquire,(void));
+void _EXFUN(__sinit_lock_release,(void));
 #endif
 
 /* Types used in positional argument support in vfprinf/vfwprintf.
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index c76527da6..37a50d47d 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -34,7 +34,7 @@ 
  * optimization) right after the _fstat() that finds the buffer size.
  */
 
-_VOID
+void
 _DEFUN(__smakebuf_r, (ptr, fp),
        struct _reent *ptr,
        register FILE *fp)
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index cda8a1112..e3e70a6f1 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -58,7 +58,7 @@  Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <string.h>
 #include "local.h"
 
-_VOID
+void
 _DEFUN(_perror_r, (ptr, s),
        struct _reent *ptr,
        const char *s)
@@ -81,7 +81,7 @@  _DEFUN(_perror_r, (ptr, s),
 
 #ifndef _REENT_ONLY
 
-_VOID
+void
 _DEFUN(perror, (s),
        const char *s)
 {
diff --git a/newlib/libc/stdio/rewind.c b/newlib/libc/stdio/rewind.c
index a09186bb0..745c93974 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -51,7 +51,7 @@  static char sccsid[] = "%W% (Berkeley) %G%";
 #include <reent.h>
 #include <stdio.h>
 
-_VOID
+void
 _DEFUN(_rewind_r, (ptr, fp),
        struct _reent * ptr,
        register FILE * fp)
@@ -62,7 +62,7 @@  _DEFUN(_rewind_r, (ptr, fp),
 
 #ifndef _REENT_ONLY
 
-_VOID
+void
 _DEFUN(rewind, (fp),
        register FILE * fp)
 {
diff --git a/newlib/libc/stdio/setbuf.c b/newlib/libc/stdio/setbuf.c
index 7308ab8c2..1538762a1 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -64,7 +64,7 @@  Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <stdio.h>
 #include "local.h"
 
-_VOID
+void
 _DEFUN(setbuf, (fp, buf),
        FILE *__restrict fp,
        char *__restrict buf)
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
index 6914ca7f2..2b93e7df3 100644
--- a/newlib/libc/stdio/setbuffer.c
+++ b/newlib/libc/stdio/setbuffer.c
@@ -64,7 +64,7 @@  Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <stdio.h>
 #include "local.h"
 
-_VOID
+void
 _DEFUN(setbuffer, (fp, buf, size),
        FILE * fp,
        char *buf,
diff --git a/newlib/libc/stdlib/abort.c b/newlib/libc/stdlib/abort.c
index ae0c2fb62..065dee5b6 100644
--- a/newlib/libc/stdlib/abort.c
+++ b/newlib/libc/stdlib/abort.c
@@ -46,7 +46,7 @@  Supporting OS subroutines required: <<_exit>> and optionally, <<write>>.
 #include <unistd.h>
 #include <signal.h>
 
-_VOID
+void
 abort (void)
 {
 #ifdef ABORT_MESSAGE
diff --git a/newlib/libc/stdlib/atexit.c b/newlib/libc/stdlib/atexit.c
index 78180895c..1710aff14 100644
--- a/newlib/libc/stdlib/atexit.c
+++ b/newlib/libc/stdlib/atexit.c
@@ -55,7 +55,7 @@  Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 int
 _DEFUN (atexit,
 	(fn),
-	_VOID _EXFNPTR(fn, (_VOID)))
+	void _EXFNPTR(fn, (void)))
 {
   return __register_exitproc (__et_atexit, fn, NULL, NULL);
 }
diff --git a/newlib/libc/stdlib/lcong48.c b/newlib/libc/stdlib/lcong48.c
index f40dede82..a16d49ecc 100644
--- a/newlib/libc/stdlib/lcong48.c
+++ b/newlib/libc/stdlib/lcong48.c
@@ -13,7 +13,7 @@ 
 
 #include "rand48.h"
 
-_VOID
+void
 _DEFUN (_lcong48_r, (r, p),
        struct _reent *r,
        unsigned short p[7])
@@ -29,7 +29,7 @@  _DEFUN (_lcong48_r, (r, p),
 }
 
 #ifndef _REENT_ONLY
-_VOID
+void
 _DEFUN (lcong48, (p),
        unsigned short p[7])
 {
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
index 329b25425..97d107e7d 100644
--- a/newlib/libc/stdlib/on_exit.c
+++ b/newlib/libc/stdlib/on_exit.c
@@ -68,7 +68,7 @@  const void * const __on_exit_dummy = &__on_exit_args;
 int
 _DEFUN (on_exit,
 	(fn, arg),
-	_VOID _EXFNPTR(fn, (int, void *)),
+	void _EXFNPTR(fn, (int, void *)),
         void *arg)
 {
   return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL);
diff --git a/newlib/libc/stdlib/srand48.c b/newlib/libc/stdlib/srand48.c
index 7042e834c..1eac2a11f 100644
--- a/newlib/libc/stdlib/srand48.c
+++ b/newlib/libc/stdlib/srand48.c
@@ -13,7 +13,7 @@ 
 
 #include "rand48.h"
 
-_VOID
+void
 _DEFUN (_srand48_r, (r, seed),
        struct _reent *r,
        long seed)
@@ -29,7 +29,7 @@  _DEFUN (_srand48_r, (r, seed),
 }
 
 #ifndef _REENT_ONLY
-_VOID
+void
 _DEFUN (srand48, (seed),
        long seed)
 {
diff --git a/newlib/libc/sys/linux/include/time.h b/newlib/libc/sys/linux/include/time.h
index 64ade9463..e5456766e 100644
--- a/newlib/libc/sys/linux/include/time.h
+++ b/newlib/libc/sys/linux/include/time.h
@@ -81,8 +81,8 @@  struct tm *_EXFUN(localtime_r,	(const time_t *, struct tm *));
 
 #ifndef __STRICT_ANSI__
 char      *_EXFUN(strptime,     (const char *, const char *, struct tm *));
-_VOID      _EXFUN(tzset,	(_VOID));
-_VOID      _EXFUN(_tzset_r,	(struct _reent *));
+void      _EXFUN(tzset,	(void));
+void      _EXFUN(_tzset_r,	(struct _reent *));
 
 typedef struct __tzrule_struct
 {
@@ -102,13 +102,13 @@  typedef struct __tzinfo_struct
   __tzrule_type __tzrule[2];
 } __tzinfo_type;
 
-__tzinfo_type *_EXFUN (__gettzinfo, (_VOID));
+__tzinfo_type *_EXFUN (__gettzinfo, (void));
 
 /* getdate functions */
 
 #ifndef _REENT_ONLY
 #define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(_VOID));
+int *_EXFUN(__getdate_err,(void));
 
 struct tm *	_EXFUN(getdate, (const char *));
 /* getdate_err is set to one of the following values to indicate the error.
diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c
index dca5fc8bc..ff3e7e6a3 100644
--- a/newlib/libc/sys/rtems/crt0.c
+++ b/newlib/libc/sys/rtems/crt0.c
@@ -189,7 +189,7 @@  RTEMS_STUB(int, issetugid (void), { return 0; })
 RTEMS_STUB(void *, _realloc_r(struct _reent *r, void *p, size_t s), { return 0; })
 RTEMS_STUB(void *, _calloc_r(struct _reent *r, size_t s1, size_t s2), { return 0; })
 RTEMS_STUB(void *, _malloc_r(struct _reent * r, size_t s), { return 0; })
-RTEMS_STUB(_VOID, _free_r(struct _reent *r, void **p), { })
+RTEMS_STUB(void, _free_r(struct _reent *r, void **p), { })
 
 /* stubs for functions required by libc/stdlib */
 RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr), { })
diff --git a/newlib/libc/time/local.h b/newlib/libc/time/local.h
index dd9d76666..10c5b445d 100644
--- a/newlib/libc/time/local.h
+++ b/newlib/libc/time/local.h
@@ -23,8 +23,8 @@  int         _EXFUN (__tzcalc_limits, (int __year));
 
 extern const int __month_lengths[2][MONSPERYEAR];
 
-_VOID _EXFUN(_tzset_unlocked_r, (struct _reent *));
-_VOID _EXFUN(_tzset_unlocked, (_VOID));
+void _EXFUN(_tzset_unlocked_r, (struct _reent *));
+void _EXFUN(_tzset_unlocked, (void));
 
 /* locks for multi-threading */
 #ifdef __SINGLE_THREAD__
@@ -35,6 +35,6 @@  _VOID _EXFUN(_tzset_unlocked, (_VOID));
 #define TZ_UNLOCK __tz_unlock()
 #endif
 
-void _EXFUN(__tz_lock,(_VOID));
-void _EXFUN(__tz_unlock,(_VOID));
+void _EXFUN(__tz_lock,(void));
+void _EXFUN(__tz_unlock,(void));
 
diff --git a/newlib/libc/time/tzlock.c b/newlib/libc/time/tzlock.c
index 153dfd3a5..4a3ee016f 100644
--- a/newlib/libc/time/tzlock.c
+++ b/newlib/libc/time/tzlock.c
@@ -35,7 +35,7 @@  until the corresponding <<__tz_unlock>> call on the same thread is made.
 __LOCK_INIT(static, __tz_mutex);
 #endif
 
-_VOID
+void
 __tz_lock (void)
 {
 #ifndef __SINGLE_THREAD__
@@ -43,7 +43,7 @@  __tz_lock (void)
 #endif
 }
 
-_VOID
+void
 __tz_unlock (void)
 {
 #ifndef __SINGLE_THREAD__
diff --git a/newlib/libc/time/tzset.c b/newlib/libc/time/tzset.c
index ca1e1d91f..3b4c01c66 100644
--- a/newlib/libc/time/tzset.c
+++ b/newlib/libc/time/tzset.c
@@ -61,13 +61,13 @@  Supporting OS subroutine required: None
 #include <time.h>
 #include "local.h"
 
-_VOID
+void
 _tzset_unlocked (void)
 {
   _tzset_unlocked_r (_REENT);
 }
 
-_VOID
+void
 tzset (void)
 {
   TZ_LOCK;
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
index 6c21e822e..211ddc8af 100644
--- a/newlib/libc/time/tzset_r.c
+++ b/newlib/libc/time/tzset_r.c
@@ -13,7 +13,7 @@  static char __tzname_std[11];
 static char __tzname_dst[11];
 static char *prev_tzenv = NULL;
 
-_VOID
+void
 _DEFUN (_tzset_unlocked_r, (reent_ptr),
         struct _reent *reent_ptr)
 {
@@ -183,7 +183,7 @@  _DEFUN (_tzset_unlocked_r, (reent_ptr),
   _daylight = tz->__tzrule[0].offset != tz->__tzrule[1].offset;
 }
 
-_VOID
+void
 _DEFUN (_tzset_r, (reent_ptr),
         struct _reent *reent_ptr)
 {