ansification: remove _DEFUN_VOID

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

38 files changed, 56 insertions, 58 deletions

diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 5e0cce4..b8d27b2 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 f461ef1..7080b05 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 165f6f7..b87f604 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 82daebe..a2bb535 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 abceb4b..c952ce5 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 997ccb7..e8b9dd9 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 c66f783..e926cbc 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 124abce..5fa98e9 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 bfb2dea..b1017d8 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 8002116..5472de1 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 806abd8..f5fe4c0 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 a578e8a..659172b 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 a7ea76b..fb43751 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 07ba9e6..b3ca289 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 516b4db..5848d47 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 61031e5..f432755 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 f5c50cc..4c854f2 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 30e9040..ee30523 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 58b945d..2012417 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 febc07a..ae0c2fb 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 89fe6af..6c4dca1 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 bfc693b..bb3289c 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 28f4f7d..62b44ed 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 b7aa93b..92f9fb7 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 aacb0a8..e6ef7a1 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 7abca6d..b3b0ca3 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 99d88bd..5d95b93 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 3931e77..1cc0f4e 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 2828976..f3298e6 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 2828976..f3298e6 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 d55a1e3..c9ff7c3 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 d55a1e3..c9ff7c3 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 21e6be0..282f73f 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 f18783c..22c7605 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 24354ad..153dfd3 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 629b8f2..ca1e1d9 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 8c637fc..b60a897 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 b7dc6d0..4279176 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;