[v2,09/17] ansification: remove _DEFUN_VOID

Message ID	20171207181909.1112-10-yselkowi@redhat.com
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of newlib-return-15497-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=obosh7z+8HM7sL8765kE3BikVYMNDn8 4WjxUfMVF9HUa3YM2t8kZFCNgJK09OiXBhTgMjerpoX0jPRVh285RaDwvS5ZMfwe 6sdBghEdeA+yfwzwle4O8d+ff/ovJCE54rlGYWo12dzISJC9qT8k9KBPjLzYpY1w AmBI26yaGpHA= Mailing-List: contact newlib-help@sourceware.org; run by ezmlm Precedence: bulk Sender: newlib-owner@sourceware.org From: Yaakov Selkowitz <yselkowi@redhat.com> To: newlib@sourceware.org Subject: [PATCH v2 09/17] ansification: remove _DEFUN_VOID Date: Thu, 7 Dec 2017 12:19:01 -0600 Message-Id: <20171207181909.1112-10-yselkowi@redhat.com> In-Reply-To: <20171207181909.1112-1-yselkowi@redhat.com> References: <20171207181909.1112-1-yselkowi@redhat.com>
Series	Newlib ANSI-fication \| expand [v2,00/17] Newlib ANSI-fication [v2,01/17] ansification: remove _AND [v2,02/17] ansification: remove _CONST [v2,03/17] ansification: remove _DOTS [v2,04/17] ansification: remove _NOARGS [v2,05/17] ansification: remove _PARAMS [v2,06/17] ansification: remove _VOID_PTR [v2,07/17] ansification: remove _PTR [v2,08/17] ansification: remove _CAST_VOID [v2,09/17] ansification: remove _DEFUN_VOID [v2,10/17] ansification: remove _VOID [v2,11/17] ansification: remove _VOLATILE, _SIGNED [v2,12/17] ansification: remove _DEFUN [v2,13/17] ansification: remove _EXFNPTR, _EXPARM [v2,14/17] ansification: remove _EXFUN, _EXFUN_NOTHROW [v2,15/17] ansification: remove _HAVE_STDC [v2,16/17] ansification: fix makedoc for ANSI C [v2,17/17] ansification: remove ansidecl.h from makedoc

diff --git a/libgloss/m68k/idp-inbyte.c b/libgloss/m68k/idp-inbyte.c index 41db57fc9..c9c403cad 100644 --- a/libgloss/m68k/idp-inbyte.c +++ b/libgloss/m68k/idp-inbyte.c @@ -32,7 +32,7 @@ * from channel A */ char -_DEFUN_VOID (inbyte) +inbyte (void) { while ((READREG (DUART_SRA) & 0x01) == 0x00) ; diff --git a/libgloss/m68k/mvme-stub.c b/libgloss/m68k/mvme-stub.c index fbc4c61b5..fcf7e7bf0 100644 --- a/libgloss/m68k/mvme-stub.c +++ b/libgloss/m68k/mvme-stub.c @@ -133,7 +133,7 @@ ExceptionHook exceptionHook; /* hook variable for errors/exceptions */ /* FORWARD DECLARATIONS */ /************************/ /** static void initializeRemcomErrorFrame PARAMS ((void)); **/ -static void _DEFUN_VOID (initializeRemcomErrorFrame); +static void initializeRemcomErrorFrame (void); /************************************************************************/ /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ @@ -203,9 +203,9 @@ jmp_buf remcomEnv; #define BREAKPOINT() asm(" trap #1"); -extern void _DEFUN_VOID (return_to_super); -extern void _DEFUN_VOID (return_to_user); -extern void _DEFUN_VOID (_catchException); +extern void return_to_super (void); +extern void return_to_user (void); +extern void _catchException (void); void _returnFromException( Frame *frame ) { diff --git a/libgloss/mcore/read.c b/libgloss/mcore/read.c index 8f394780c..d97d98d22 100644 --- a/libgloss/mcore/read.c +++ b/libgloss/mcore/read.c @@ -14,7 +14,7 @@ */ #include "glue.h" -extern char _DEFUN_VOID (inbyte); +extern char inbyte (void); /* * read -- read bytes from the serial port. Ignore fd, since diff --git a/libgloss/read.c b/libgloss/read.c index 2e5e0c72c..507c9802f 100644 --- a/libgloss/read.c +++ b/libgloss/read.c @@ -14,7 +14,7 @@ */ #include "glue.h" -extern char _DEFUN_VOID (inbyte); +extern char inbyte (void); /* * read -- read bytes from the serial port. Ignore fd, since diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h index 5e0cce4c8..b8d27b24e 100644 --- a/newlib/libc/include/_ansi.h +++ b/newlib/libc/include/_ansi.h @@ -62,7 +62,6 @@ #define _EXFNPTR(name, proto) (* name) proto #endif #define _DEFUN(name, arglist, args) name(args) -#define _DEFUN_VOID(name) name(void) #ifndef _LONG_DOUBLE #define _LONG_DOUBLE long double #endif @@ -73,7 +72,6 @@ #define _EXFUN(name, proto) name() #define _EXFUN_NOTHROW(name, proto) name() #define _DEFUN(name, arglist, args) name arglist args; -#define _DEFUN_VOID(name) name() #define _LONG_DOUBLE double #endif diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c index f461ef162..7080b0510 100644 --- a/newlib/libc/locale/locale.c +++ b/newlib/libc/locale/locale.c @@ -966,7 +966,7 @@ __get_locale_env (struct _reent *p, int category) #endif /* _MB_CAPABLE */ int -_DEFUN_VOID (__locale_mb_cur_max) +__locale_mb_cur_max (void) { #ifdef __HAVE_LOCALE_INFO__ return __get_current_ctype_locale ()->mb_cur_max[0]; diff --git a/newlib/libc/locale/localeconv.c b/newlib/libc/locale/localeconv.c index 165f6f7c3..b87f604a3 100644 --- a/newlib/libc/locale/localeconv.c +++ b/newlib/libc/locale/localeconv.c @@ -62,7 +62,7 @@ _DEFUN (_localeconv_r, (data), #ifndef _REENT_ONLY struct lconv * -_DEFUN_VOID (localeconv) +localeconv (void) { return __localeconv_l (__get_current_locale ()); } diff --git a/newlib/libc/machine/microblaze/abort.c b/newlib/libc/machine/microblaze/abort.c index 82daebe43..a2bb535e0 100644 --- a/newlib/libc/machine/microblaze/abort.c +++ b/newlib/libc/machine/microblaze/abort.c @@ -47,7 +47,7 @@ Supporting OS subroutines required: <<_exit>> and optionally, <<write>>. #include <signal.h> _VOID -_DEFUN_VOID (abort) +abort (void) { #ifdef ABORT_MESSAGE write (2, "Abort called\n", sizeof ("Abort called\n")-1); diff --git a/newlib/libc/machine/nds32/abort.c b/newlib/libc/machine/nds32/abort.c index abceb4b8b..c952ce569 100644 --- a/newlib/libc/machine/nds32/abort.c +++ b/newlib/libc/machine/nds32/abort.c @@ -29,7 +29,7 @@ Supporting OS subroutines required: <<_exit>>. #include <unistd.h> _VOID -_DEFUN_VOID (abort) +abort (void) { while (1) { diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdio.c index 997ccb7a0..e8b9dd9fa 100644 --- a/newlib/libc/machine/spu/stdio.c +++ b/newlib/libc/machine/spu/stdio.c @@ -82,7 +82,7 @@ _DEFUN (__sinit, (s), } _VOID -_DEFUN_VOID (__check_init) +__check_init (void) { CHECK_INIT(_REENT); } diff --git a/newlib/libc/machine/spu/tmpfile.c b/newlib/libc/machine/spu/tmpfile.c index c66f78388..e926cbc48 100644 --- a/newlib/libc/machine/spu/tmpfile.c +++ b/newlib/libc/machine/spu/tmpfile.c @@ -37,7 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com> #ifndef _REENT_ONLY FILE * -_DEFUN_VOID (tmpfile) +tmpfile (void) { int ret; FILE* fp; diff --git a/newlib/libc/reent/getreent.c b/newlib/libc/reent/getreent.c index 124abce2a..5fa98e96b 100644 --- a/newlib/libc/reent/getreent.c +++ b/newlib/libc/reent/getreent.c @@ -14,7 +14,7 @@ int _dummy_getreent; #endif struct _reent * -_DEFUN_VOID(__getreent) +__getreent (void) { return _impure_ptr; } diff --git a/newlib/libc/reent/signgam.c b/newlib/libc/reent/signgam.c index bfb2dea51..b1017d861 100644 --- a/newlib/libc/reent/signgam.c +++ b/newlib/libc/reent/signgam.c @@ -8,7 +8,7 @@ #ifndef _REENT_ONLY int * -_DEFUN_VOID (__signgam) +__signgam (void) { return &_REENT_SIGNGAM(_REENT); } diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c index 800211689..5472de1f0 100644 --- a/newlib/libc/search/hcreate.c +++ b/newlib/libc/search/hcreate.c @@ -63,7 +63,7 @@ _DEFUN(hcreate, (nel), size_t nel) } void -_DEFUN_VOID (hdestroy) +hdestroy (void) { hdestroy_r (&htab); } diff --git a/newlib/libc/signal/signal.c b/newlib/libc/signal/signal.c index 806abd888..f5fe4c0b9 100644 --- a/newlib/libc/signal/signal.c +++ b/newlib/libc/signal/signal.c @@ -213,7 +213,7 @@ _DEFUN (signal, (sig, func), } int -_DEFUN_VOID (_init_signal) +_init_signal (void) { return _init_signal_r (_REENT); } diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c index a578e8a00..659172b32 100644 --- a/newlib/libc/stdio/fcloseall.c +++ b/newlib/libc/stdio/fcloseall.c @@ -66,7 +66,7 @@ _DEFUN(_fcloseall_r, (ptr), #ifndef _REENT_ONLY int -_DEFUN_VOID(fcloseall) +fcloseall (void) { return _fcloseall_r (_GLOBAL_REENT); } diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index a7ea76bb5..fb437515d 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -235,7 +235,7 @@ _DEFUN(_cleanup_r, (ptr), #ifndef _REENT_ONLY _VOID -_DEFUN_VOID(_cleanup) +_cleanup (void) { _cleanup_r (_GLOBAL_REENT); } @@ -304,25 +304,25 @@ __LOCK_INIT_RECURSIVE(static, __sfp_recursive_mutex); __LOCK_INIT_RECURSIVE(static, __sinit_recursive_mutex); _VOID -_DEFUN_VOID(__sfp_lock_acquire) +__sfp_lock_acquire (void) { __lock_acquire_recursive (__sfp_recursive_mutex); } _VOID -_DEFUN_VOID(__sfp_lock_release) +__sfp_lock_release (void) { __lock_release_recursive (__sfp_recursive_mutex); } _VOID -_DEFUN_VOID(__sinit_lock_acquire) +__sinit_lock_acquire (void) { __lock_acquire_recursive (__sinit_recursive_mutex); } _VOID -_DEFUN_VOID(__sinit_lock_release) +__sinit_lock_release (void) { __lock_release_recursive (__sinit_recursive_mutex); } @@ -350,7 +350,7 @@ _DEFUN(__fp_unlock, (ptr), } _VOID -_DEFUN_VOID(__fp_lock_all) +__fp_lock_all (void) { __sfp_lock_acquire (); @@ -358,7 +358,7 @@ _DEFUN_VOID(__fp_lock_all) } _VOID -_DEFUN_VOID(__fp_unlock_all) +__fp_unlock_all (void) { (void) _fwalk (_REENT, __fp_unlock); diff --git a/newlib/libc/stdio/getchar.c b/newlib/libc/stdio/getchar.c index 07ba9e64f..b3ca289ba 100644 --- a/newlib/libc/stdio/getchar.c +++ b/newlib/libc/stdio/getchar.c @@ -82,7 +82,7 @@ _DEFUN(_getchar_r, (reent), #ifndef _REENT_ONLY int -_DEFUN_VOID(getchar) +getchar (void) { struct _reent *reent = _REENT; diff --git a/newlib/libc/stdio/getchar_u.c b/newlib/libc/stdio/getchar_u.c index 516b4dbd2..5848d47ac 100644 --- a/newlib/libc/stdio/getchar_u.c +++ b/newlib/libc/stdio/getchar_u.c @@ -79,7 +79,7 @@ _DEFUN(_getchar_unlocked_r, (ptr), #ifndef _REENT_ONLY int -_DEFUN_VOID(getchar_unlocked) +getchar_unlocked (void) { /* CHECK_INIT is called (eventually) by __srefill_r. */ diff --git a/newlib/libc/stdio/getwchar.c b/newlib/libc/stdio/getwchar.c index 61031e5a6..f432755a0 100644 --- a/newlib/libc/stdio/getwchar.c +++ b/newlib/libc/stdio/getwchar.c @@ -103,7 +103,7 @@ _DEFUN (_getwchar_r, (ptr), * Synonym for fgetwc(stdin). */ wint_t -_DEFUN_VOID (getwchar) +getwchar (void) { _REENT_SMALL_CHECK_INIT (_REENT); return fgetwc (stdin); diff --git a/newlib/libc/stdio/getwchar_u.c b/newlib/libc/stdio/getwchar_u.c index f5c50cced..4c854f213 100644 --- a/newlib/libc/stdio/getwchar_u.c +++ b/newlib/libc/stdio/getwchar_u.c @@ -44,7 +44,7 @@ _DEFUN (_getwchar_unlocked_r, (ptr), * Synonym for fgetwc_unlocked(stdin). */ wint_t -_DEFUN_VOID (getwchar_unlocked) +getwchar_unlocked (void) { _REENT_SMALL_CHECK_INIT (_REENT); return fgetwc_unlocked (stdin); diff --git a/newlib/libc/stdio/tmpfile.c b/newlib/libc/stdio/tmpfile.c index 30e9040fd..ee30523ab 100644 --- a/newlib/libc/stdio/tmpfile.c +++ b/newlib/libc/stdio/tmpfile.c @@ -81,7 +81,7 @@ _DEFUN(_tmpfile_r, (ptr), #ifndef _REENT_ONLY FILE * -_DEFUN_VOID(tmpfile) +tmpfile (void) { return _tmpfile_r (_REENT); } diff --git a/newlib/libc/stdio64/tmpfile64.c b/newlib/libc/stdio64/tmpfile64.c index 58b945d5b..2012417fb 100644 --- a/newlib/libc/stdio64/tmpfile64.c +++ b/newlib/libc/stdio64/tmpfile64.c @@ -84,7 +84,7 @@ _DEFUN (_tmpfile64_r, (ptr), #ifndef _REENT_ONLY FILE * -_DEFUN_VOID (tmpfile64) +tmpfile64 (void) { return _tmpfile64_r (_REENT); } diff --git a/newlib/libc/stdlib/abort.c b/newlib/libc/stdlib/abort.c index febc07a31..ae0c2fb62 100644 --- a/newlib/libc/stdlib/abort.c +++ b/newlib/libc/stdlib/abort.c @@ -47,7 +47,7 @@ Supporting OS subroutines required: <<_exit>> and optionally, <<write>>. #include <signal.h> _VOID -_DEFUN_VOID (abort) +abort (void) { #ifdef ABORT_MESSAGE write (2, "Abort called\n", sizeof ("Abort called\n")-1); diff --git a/newlib/libc/stdlib/drand48.c b/newlib/libc/stdlib/drand48.c index 89fe6af1d..6c4dca1ed 100644 --- a/newlib/libc/stdlib/drand48.c +++ b/newlib/libc/stdlib/drand48.c @@ -23,7 +23,7 @@ _DEFUN (_drand48_r, (r), #ifndef _REENT_ONLY double -_DEFUN_VOID (drand48) +drand48 (void) { return _drand48_r (_REENT); } diff --git a/newlib/libc/stdlib/lrand48.c b/newlib/libc/stdlib/lrand48.c index bfc693b75..bb3289c83 100644 --- a/newlib/libc/stdlib/lrand48.c +++ b/newlib/libc/stdlib/lrand48.c @@ -25,7 +25,7 @@ _DEFUN (_lrand48_r, (r), #ifndef _REENT_ONLY long -_DEFUN_VOID (lrand48) +lrand48 (void) { return _lrand48_r (_REENT); } diff --git a/newlib/libc/stdlib/mrand48.c b/newlib/libc/stdlib/mrand48.c index 28f4f7d2b..62b44edc9 100644 --- a/newlib/libc/stdlib/mrand48.c +++ b/newlib/libc/stdlib/mrand48.c @@ -24,7 +24,7 @@ _DEFUN (_mrand48_r, (r), #ifndef _REENT_ONLY long -_DEFUN_VOID (mrand48) +mrand48 (void) { return _mrand48_r (_REENT); } diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c index b7aa93b28..92f9fb792 100644 --- a/newlib/libc/stdlib/mstats.c +++ b/newlib/libc/stdlib/mstats.c @@ -84,14 +84,14 @@ not portable. #ifndef _REENT_ONLY struct mallinfo -_DEFUN_VOID (mallinfo) +mallinfo (void) { return _mallinfo_r (_REENT); } #if !defined (_ELIX_LEVEL) || _ELIX_LEVEL >= 2 void -_DEFUN_VOID (malloc_stats) +malloc_stats (void) { _malloc_stats_r (_REENT); } diff --git a/newlib/libc/stdlib/rand.c b/newlib/libc/stdlib/rand.c index aacb0a8a4..e6ef7a1f6 100644 --- a/newlib/libc/stdlib/rand.c +++ b/newlib/libc/stdlib/rand.c @@ -68,7 +68,7 @@ _DEFUN (srand, (seed), unsigned int seed) } int -_DEFUN_VOID (rand) +rand (void) { struct _reent *reent = _REENT; diff --git a/newlib/libc/stdlib/random.c b/newlib/libc/stdlib/random.c index 7abca6da4..b3b0ca305 100644 --- a/newlib/libc/stdlib/random.c +++ b/newlib/libc/stdlib/random.c @@ -66,7 +66,7 @@ _DEFUN (srandom, (seed), unsigned int seed) } long int -_DEFUN_VOID (random) +random (void) { struct _reent *reent = _REENT; diff --git a/newlib/libc/sys/a29khif/getpid.c b/newlib/libc/sys/a29khif/getpid.c index 99d88bd39..5d95b933e 100644 --- a/newlib/libc/sys/a29khif/getpid.c +++ b/newlib/libc/sys/a29khif/getpid.c @@ -6,7 +6,7 @@ <sys/types.h>. */ int -_DEFUN_VOID (_getpid) +_getpid (void) { return 1; } diff --git a/newlib/libc/sys/linux/getlogin.c b/newlib/libc/sys/linux/getlogin.c index 3931e7731..1cc0f4e04 100644 --- a/newlib/libc/sys/linux/getlogin.c +++ b/newlib/libc/sys/linux/getlogin.c @@ -3,7 +3,7 @@ #include <unistd.h> char * -_DEFUN_VOID (getlogin) +getlogin (void) { errno = ENOSYS; return NULL; diff --git a/newlib/libc/sys/sparc64/ieee.c b/newlib/libc/sys/sparc64/ieee.c index 28289761d..f3298e63d 100644 --- a/newlib/libc/sys/sparc64/ieee.c +++ b/newlib/libc/sys/sparc64/ieee.c @@ -3,7 +3,7 @@ fp_rnd -_DEFUN_VOID(fpgetround) +fpgetround (void) { char *out; ieee_flags("get", "direction","", &out); @@ -44,7 +44,7 @@ _DEFUN(fpsetround,(new), fp_except -_DEFUN_VOID(fpgetmask) +fpgetmask (void) { char *out; int r = 0; @@ -92,7 +92,7 @@ _DEFUN(fpsetsticky,(mask), } fp_except -_DEFUN_VOID(fpgetsticky) +fpgetsticky (void) { return fpgetmask(); } @@ -107,7 +107,7 @@ _DEFUN(fpsetroundtoi,(rdi_mode), } int -_DEFUN_VOID(fpgetroundtoi) +fpgetroundtoi (void) { return 0; diff --git a/newlib/libc/sys/sun4/ieee.c b/newlib/libc/sys/sun4/ieee.c index 28289761d..f3298e63d 100644 --- a/newlib/libc/sys/sun4/ieee.c +++ b/newlib/libc/sys/sun4/ieee.c @@ -3,7 +3,7 @@ fp_rnd -_DEFUN_VOID(fpgetround) +fpgetround (void) { char *out; ieee_flags("get", "direction","", &out); @@ -44,7 +44,7 @@ _DEFUN(fpsetround,(new), fp_except -_DEFUN_VOID(fpgetmask) +fpgetmask (void) { char *out; int r = 0; @@ -92,7 +92,7 @@ _DEFUN(fpsetsticky,(mask), } fp_except -_DEFUN_VOID(fpgetsticky) +fpgetsticky (void) { return fpgetmask(); } @@ -107,7 +107,7 @@ _DEFUN(fpsetroundtoi,(rdi_mode), } int -_DEFUN_VOID(fpgetroundtoi) +fpgetroundtoi (void) { return 0; diff --git a/newlib/libc/sys/sysvi386/fpx.c b/newlib/libc/sys/sysvi386/fpx.c index d55a1e30f..c9ff7c314 100644 --- a/newlib/libc/sys/sysvi386/fpx.c +++ b/newlib/libc/sys/sysvi386/fpx.c @@ -17,7 +17,7 @@ fp_except _DEFUN(fpsetmask,(newmask), } -fp_except _DEFUN_VOID(fpgetmask) +fp_except fpgetmask (void) { v60_tkcw_type tkcw; sysv60(0, 8, &tkcw); @@ -25,7 +25,7 @@ fp_except _DEFUN_VOID(fpgetmask) } -fp_rnd _DEFUN_VOID(fpgetround) +fp_rnd fpgetround (void) { v60_tkcw_type tkcw; sysv60(0, 8, &tkcw); @@ -49,7 +49,7 @@ fp_rnd _DEFUN(fpsetround,(rnd), -fp_rdi _DEFUN_VOID(fpgetroundtoi) +fp_rdi fpgetroundtoi (void) { v60_tkcw_type tkcw; sysv60(0, 8, &tkcw); diff --git a/newlib/libc/sys/sysvnecv70/fpx.c b/newlib/libc/sys/sysvnecv70/fpx.c index d55a1e30f..c9ff7c314 100644 --- a/newlib/libc/sys/sysvnecv70/fpx.c +++ b/newlib/libc/sys/sysvnecv70/fpx.c @@ -17,7 +17,7 @@ fp_except _DEFUN(fpsetmask,(newmask), } -fp_except _DEFUN_VOID(fpgetmask) +fp_except fpgetmask (void) { v60_tkcw_type tkcw; sysv60(0, 8, &tkcw); @@ -25,7 +25,7 @@ fp_except _DEFUN_VOID(fpgetmask) } -fp_rnd _DEFUN_VOID(fpgetround) +fp_rnd fpgetround (void) { v60_tkcw_type tkcw; sysv60(0, 8, &tkcw); @@ -49,7 +49,7 @@ fp_rnd _DEFUN(fpsetround,(rnd), -fp_rdi _DEFUN_VOID(fpgetroundtoi) +fp_rdi fpgetroundtoi (void) { v60_tkcw_type tkcw; sysv60(0, 8, &tkcw); diff --git a/newlib/libc/syscalls/sysfork.c b/newlib/libc/syscalls/sysfork.c index 21e6be0e2..282f73fe3 100644 --- a/newlib/libc/syscalls/sysfork.c +++ b/newlib/libc/syscalls/sysfork.c @@ -8,7 +8,7 @@ #include <unistd.h> int -_DEFUN_VOID (fork) +fork (void) { return _fork_r (_REENT); } diff --git a/newlib/libc/syscalls/sysgetpid.c b/newlib/libc/syscalls/sysgetpid.c index f18783c75..22c7605e8 100644 --- a/newlib/libc/syscalls/sysgetpid.c +++ b/newlib/libc/syscalls/sysgetpid.c @@ -4,7 +4,7 @@ #include <unistd.h> int -_DEFUN_VOID (getpid) +getpid (void) { return _getpid_r (_REENT); } diff --git a/newlib/libc/time/tzlock.c b/newlib/libc/time/tzlock.c index 24354ad0b..153dfd3a5 100644 --- a/newlib/libc/time/tzlock.c +++ b/newlib/libc/time/tzlock.c @@ -36,7 +36,7 @@ __LOCK_INIT(static, __tz_mutex); #endif _VOID -_DEFUN_VOID (__tz_lock) +__tz_lock (void) { #ifndef __SINGLE_THREAD__ __lock_acquire(__tz_mutex); @@ -44,7 +44,7 @@ _DEFUN_VOID (__tz_lock) } _VOID -_DEFUN_VOID (__tz_unlock) +__tz_unlock (void) { #ifndef __SINGLE_THREAD__ __lock_release(__tz_mutex); diff --git a/newlib/libc/time/tzset.c b/newlib/libc/time/tzset.c index 629b8f240..ca1e1d91f 100644 --- a/newlib/libc/time/tzset.c +++ b/newlib/libc/time/tzset.c @@ -62,13 +62,13 @@ Supporting OS subroutine required: None #include "local.h" _VOID -_DEFUN_VOID (_tzset_unlocked) +_tzset_unlocked (void) { _tzset_unlocked_r (_REENT); } _VOID -_DEFUN_VOID (tzset) +tzset (void) { TZ_LOCK; _tzset_unlocked_r (_REENT); diff --git a/newlib/libc/xdr/xdr.c b/newlib/libc/xdr/xdr.c index 8c637fcbf..b60a89782 100644 --- a/newlib/libc/xdr/xdr.c +++ b/newlib/libc/xdr/xdr.c @@ -76,7 +76,7 @@ _DEFUN (xdr_free, (proc, objp), * XDR nothing */ bool_t -_DEFUN_VOID (xdr_void) +xdr_void (void) { return TRUE; } diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c index b7dc6d098..427917640 100644 --- a/newlib/libc/xdr/xdr_sizeof.c +++ b/newlib/libc/xdr/xdr_sizeof.c @@ -111,7 +111,7 @@ _DEFUN (x_inline, (xdrs, len), } static int -_DEFUN_VOID (harmless) +harmless (void) { /* Always return FALSE/NULL, as the case may be */ return 0; diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c index 8420cdec7..24188fa8b 100644 --- a/newlib/libm/test/convert.c +++ b/newlib/libm/test/convert.c @@ -13,7 +13,7 @@ extern double_type doubles[]; double_type *pd = doubles; void -_DEFUN_VOID(test_strtod) +test_strtod (void) { char *tail; double v; @@ -24,7 +24,7 @@ _DEFUN_VOID(test_strtod) } void -_DEFUN_VOID(test_strtof) +test_strtof (void) { char *tail; double v; @@ -35,13 +35,13 @@ _DEFUN_VOID(test_strtof) } void -_DEFUN_VOID(test_atof) +test_atof (void) { test_mok(atof(pd->string), pd->value, 64); } void -_DEFUN_VOID(test_atoff) +test_atoff (void) { test_mok(atoff(pd->string), pd->value, 32); } @@ -101,7 +101,7 @@ _DEFUN(test_strtol_base,(base, pi, string), } void -_DEFUN_VOID(test_strtol) +test_strtol (void) { test_strtol_base(8,&(p->octal), p->string); test_strtol_base(10,&(p->decimal), p->string); @@ -111,14 +111,14 @@ _DEFUN_VOID(test_strtol) } void -_DEFUN_VOID(test_atoi) +test_atoi (void) { test_iok(atoi(p->string), p->decimal.value); test_eok(errno, p->decimal.errno_val); } void -_DEFUN_VOID(test_atol) +test_atol (void) { test_iok(atol(p->string), p->decimal.value); test_eok(errno, p->decimal.errno_val); @@ -128,7 +128,7 @@ _DEFUN_VOID(test_atol) extern ddouble_type ddoubles[]; ddouble_type *pdd; void -_DEFUN_VOID(test_ecvtbuf) +test_ecvtbuf (void) { int a2,a3; char *s; @@ -140,7 +140,7 @@ _DEFUN_VOID(test_ecvtbuf) } void -_DEFUN_VOID(test_ecvt) +test_ecvt (void) { int a2,a3; char *s; @@ -158,7 +158,7 @@ _DEFUN_VOID(test_ecvt) } void -_DEFUN_VOID(test_fcvtbuf) +test_fcvtbuf (void) { int a2,a3; char *s; @@ -170,7 +170,7 @@ _DEFUN_VOID(test_fcvtbuf) } void -_DEFUN_VOID(test_gcvt) +test_gcvt (void) { char *s = gcvt(pdd->value, pdd->g1, buffer); test_scok(s, pdd->gstring, 9); @@ -181,7 +181,7 @@ _DEFUN_VOID(test_gcvt) } void -_DEFUN_VOID(test_fcvt) +test_fcvt (void) { int a2,a3; char *sd; @@ -223,7 +223,7 @@ _DEFUN(diterate,(func, name), void -_DEFUN_VOID(deltest) +deltest (void) { newfunc("rounding"); line(1); @@ -255,7 +255,7 @@ _DEFUN_VOID(deltest) /* Most of what sprint does is tested with the tests of fcvt/ecvt/gcvt, but here are some more */ void -_DEFUN_VOID(test_sprint) +test_sprint (void) { extern sprint_double_type sprint_doubles[]; sprint_double_type *s = sprint_doubles; @@ -286,7 +286,7 @@ _DEFUN_VOID(test_sprint) /* Scanf calls strtod etc tested elsewhere, but also has some pattern matching skills */ void -_DEFUN_VOID(test_scan) +test_scan (void) { int i,j; extern sprint_double_type sprint_doubles[]; @@ -340,7 +340,7 @@ _DEFUN_VOID(test_scan) } void -_DEFUN_VOID(test_cvt) +test_cvt (void) { deltest(); diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c index 50b22223a..f58f64f79 100644 --- a/newlib/libm/test/math.c +++ b/newlib/libm/test/math.c @@ -354,7 +354,7 @@ _DEFUN(run_vector_1,(vector, p, func, name, args), } void -_DEFUN_VOID(test_math) +test_math (void) { test_acos(0); test_acosf(0); diff --git a/newlib/libm/test/math2.c b/newlib/libm/test/math2.c index 50b537646..b7108de4a 100644 --- a/newlib/libm/test/math2.c +++ b/newlib/libm/test/math2.c @@ -4,14 +4,14 @@ int -_DEFUN_VOID(randi) +randi (void) { static int next; next = (next * 1103515245) + 12345; return ((next >> 16) & 0xffff); } -double _DEFUN_VOID(randx) +double randx (void) { double res; @@ -34,7 +34,7 @@ double _DEFUN_VOID(randx) } /* Return a random double, but bias for numbers closer to 0 */ -double _DEFUN_VOID(randy) +double randy (void) { int pow; double r= randx(); @@ -43,7 +43,7 @@ double _DEFUN_VOID(randy) } void -_DEFUN_VOID(test_frexp) +test_frexp (void) { int i; double r; @@ -131,7 +131,7 @@ _DEFUN_VOID(test_frexp) */ void -_DEFUN_VOID(test_mod) +test_mod (void) { int i; @@ -176,7 +176,7 @@ _DEFUN_VOID(test_mod) Test pow by multiplying logs */ void -_DEFUN_VOID(test_pow) +test_pow (void) { unsigned int i; newfunc("pow"); @@ -224,7 +224,7 @@ _DEFUN_VOID(test_pow) void -_DEFUN_VOID(test_math2) +test_math2 (void) { test_mod(); test_frexp(); diff --git a/newlib/libm/test/test_ieee.c b/newlib/libm/test/test_ieee.c index 07c49418d..167a40c87 100644 --- a/newlib/libm/test/test_ieee.c +++ b/newlib/libm/test/test_ieee.c @@ -6,7 +6,7 @@ /* Test fp getround and fp setround */ void -_DEFUN_VOID(test_getround) +test_getround (void) { newfunc("fpgetround/fpsetround"); @@ -26,7 +26,7 @@ _DEFUN_VOID(test_getround) /* And fpset/fpgetmask */ void -_DEFUN_VOID(test_getmask) +test_getmask (void) { newfunc("fpsetmask/fpgetmask"); line(1); @@ -47,7 +47,7 @@ _DEFUN_VOID(test_getmask) } void -_DEFUN_VOID(test_getsticky) +test_getsticky (void) { newfunc("fpsetsticky/fpgetsticky"); line(1); @@ -68,7 +68,7 @@ _DEFUN_VOID(test_getsticky) } void -_DEFUN_VOID(test_getroundtoi) +test_getroundtoi (void) { newfunc("fpsetroundtoi/fpgetroundtoi"); line(1); @@ -105,7 +105,7 @@ double sub_rounded_down ; double sub_rounded_up ; double r1,r2,r3,r4; void -_DEFUN_VOID(test_round) +test_round (void) { n = dnumber(0x40000000, 0x00000008); /* near 2 */ m = dnumber(0x40400000, 0x00000003); /* near 3.4 */ @@ -163,7 +163,7 @@ _DEFUN_VOID(test_round) void -_DEFUN_VOID(test_ieee) +test_ieee (void) { fp_rnd old = fpgetround(); test_getround(); diff --git a/newlib/libm/test/test_is.c b/newlib/libm/test/test_is.c index 39c15c10e..c4c8e2fdb 100644 --- a/newlib/libm/test/test_is.c +++ b/newlib/libm/test/test_is.c @@ -1993,7 +1993,7 @@ _DEFUN(test_to_set,(func, name, p, low, high), #undef _toupper void -_DEFUN_VOID(test_is) +test_is (void) { test_is_set(def_isalnum, "isalnum define", &myalnum); test_is_set(def_isalpha, "isalpha define", &myalpha);

[v2,09/17] ansification: remove _DEFUN_VOID

Commit Message

Patch