2003-06-03 Jeff Johnston <jjohnstn@redhat.com>

        * libc/reent/execr.c: Use _DEFUN macro for function declaration.
        * libc/reent/fcntlr.c: Ditto.
        * libc/reent/fstat64r.c: Ditto.
        * libc/reent/linkr.c: Ditto.
        * libc/reent/lseek64r.c: Ditto.
        * libc/reent/lseekr.c: Ditto.
        * libc/reent/openr.c: Ditto.
        * libc/reent/readr.c: Ditto.
        * libc/reent/reent.c: Ditto.
        * libc/reent/sbrkr.c: Ditto.
        * libc/reent/signalr.c: Ditto.
        * libc/reent/signgam.c: Ditto.
        * libc/reent/statr.c: Ditto.
        * libc/reent/timer.c: Ditto.
        * libc/reent/unlinkr.c: Ditto.
        * libc/reent/writer.c: Ditto.
        * libc/syscalls/sysclose.c: Ditto.
        * libc/syscalls/sysexecve.c: Ditto.
        * libc/syscalls/sysfcntl.c: Ditto.
        * libc/syscalls/sysfork.c: Ditto.
        * libc/syscalls/sysfstat.c: Ditto.
        * libc/syscalls/sysgetpid.c: Ditto.
        * libc/syscalls/sysgettod.c: Ditto.
        * libc/syscalls/syskill.c: Ditto.
        * libc/syscalls/syslink.c: Ditto.
        * libc/syscalls/syslseek.c: Ditto.
        * libc/syscalls/sysopen.c: Ditto.
        * libc/syscalls/sysread.c: Ditto.
        * libc/syscalls/syssbrk.c: Ditto.
        * libc/syscalls/sysstat.c: Ditto.
        * libc/syscalls/systimes.c: Ditto.
        * libc/syscalls/sysunlink.c: Ditto.
        * libc/syscalls/syswait.c: Ditto.

35 files changed, 165 insertions, 126 deletions

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 808795803..7759a9407 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,40 @@
+2003-06-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/reent/execr.c: Use _DEFUN macro for function declaration.
+	* libc/reent/fcntlr.c: Ditto.
+	* libc/reent/fstat64r.c: Ditto.
+	* libc/reent/linkr.c: Ditto.
+	* libc/reent/lseek64r.c: Ditto.
+	* libc/reent/lseekr.c: Ditto.
+	* libc/reent/openr.c: Ditto.
+	* libc/reent/readr.c: Ditto.
+	* libc/reent/reent.c: Ditto.
+	* libc/reent/sbrkr.c: Ditto.
+	* libc/reent/signalr.c: Ditto.
+	* libc/reent/signgam.c: Ditto.
+	* libc/reent/statr.c: Ditto.
+	* libc/reent/timer.c: Ditto.
+	* libc/reent/unlinkr.c: Ditto.
+	* libc/reent/writer.c: Ditto.
+	* libc/syscalls/sysclose.c: Ditto.
+	* libc/syscalls/sysexecve.c: Ditto.
+	* libc/syscalls/sysfcntl.c: Ditto.
+	* libc/syscalls/sysfork.c: Ditto.
+	* libc/syscalls/sysfstat.c: Ditto.
+	* libc/syscalls/sysgetpid.c: Ditto.
+	* libc/syscalls/sysgettod.c: Ditto.
+	* libc/syscalls/syskill.c: Ditto.
+	* libc/syscalls/syslink.c: Ditto.
+	* libc/syscalls/syslseek.c: Ditto.
+	* libc/syscalls/sysopen.c: Ditto.
+	* libc/syscalls/sysread.c: Ditto.
+	* libc/syscalls/syssbrk.c: Ditto.
+	* libc/syscalls/sysstat.c: Ditto.
+	* libc/syscalls/systimes.c: Ditto.
+	* libc/syscalls/sysunlink.c: Ditto.
+	* libc/syscalls/syswait.c: Ditto.
+	* libc/syscalls/syswrite.c: Ditto.
+
 2003-06-03  Till Straumann  <strauman@SLAC.Stanford.EDU>
 
 	* libc/time/tzset_r.c: Change local variables that are
diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index 0fbddb94d..8bc1208d7 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -53,11 +53,11 @@ DESCRIPTION
 */
 
 int
-_execve_r (ptr, name, argv, env)
-     struct _reent *ptr;
-     char *name;
-     char **argv;
-     char **env;
+_DEFUN (_execve_r, (ptr, name, argv, env),
+     struct _reent *ptr _AND
+     char *name _AND
+     char **argv _AND
+     char **env)
 {
   int ret;
 
@@ -93,8 +93,8 @@ DESCRIPTION
 #ifndef NO_FORK
 
 int
-_fork_r (ptr)
-     struct _reent *ptr;
+_DEFUN (_fork_r, (ptr),
+     struct _reent *ptr)
 {
   int ret;
 
@@ -130,9 +130,9 @@ DESCRIPTION
 */
 
 int
-_wait_r (ptr, status)
-     struct _reent *ptr;
-     int *status;
+_DEFUN (_wait_r, (ptr, status),
+     struct _reent *ptr _AND
+     int *status)
 {
   int ret;
 
diff --git a/newlib/libc/reent/fcntlr.c b/newlib/libc/reent/fcntlr.c
index e64dfe28a..d632d183f 100644
--- a/newlib/libc/reent/fcntlr.c
+++ b/newlib/libc/reent/fcntlr.c
@@ -48,11 +48,11 @@ DESCRIPTION
 */
 
 int
-_fcntl_r (ptr, fd, cmd, arg)
-     struct _reent *ptr;
-     int fd;
-     int cmd;
-     int arg;
+_DEFUN (_fcntl_r, (ptr, fd, cmd, arg),
+     struct _reent *ptr _AND
+     int fd _AND
+     int cmd _AND
+     int arg)
 {
   int ret;
 
diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c
index c418778b7..1c4589713 100644
--- a/newlib/libc/reent/fstat64r.c
+++ b/newlib/libc/reent/fstat64r.c
@@ -54,10 +54,10 @@ DESCRIPTION
 */
 
 int
-_fstat64_r (ptr, fd, pstat)
-     struct _reent *ptr;
-     int fd;
-     struct stat64 *pstat;
+_DEFUN (_fstat64_r, (ptr, fd, pstat),
+     struct _reent *ptr _AND
+     int fd _AND
+     struct stat64 *pstat)
 {
   int ret;
 
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index eda8d038c..ded636af7 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -50,10 +50,10 @@ DESCRIPTION
 */
 
 int
-_link_r (ptr, old, new)
-     struct _reent *ptr;
-     _CONST char *old;
-     _CONST char *new;
+_DEFUN (_link_r, (ptr, old, new),
+     struct _reent *ptr _AND
+     _CONST char *old _AND
+     _CONST char *new)
 {
   int ret;
 
diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c
index 342cae2eb..0207a1220 100644
--- a/newlib/libc/reent/lseek64r.c
+++ b/newlib/libc/reent/lseek64r.c
@@ -49,11 +49,11 @@ DESCRIPTION
 */
 
 _off64_t
-_lseek64_r (ptr, fd, pos, whence)
-     struct _reent *ptr;
-     int fd;
-     _off64_t pos;
-     int whence;
+_DEFUN (_lseek64_r, (ptr, fd, pos, whence),
+     struct _reent *ptr _AND
+     int fd _AND
+     _off64_t pos _AND
+     int whence)
 {
   _off64_t ret;
 
diff --git a/newlib/libc/reent/lseekr.c b/newlib/libc/reent/lseekr.c
index 817d52a26..fa00695a8 100644
--- a/newlib/libc/reent/lseekr.c
+++ b/newlib/libc/reent/lseekr.c
@@ -46,11 +46,11 @@ DESCRIPTION
 */
 
 _off_t
-_lseek_r (ptr, fd, pos, whence)
-     struct _reent *ptr;
-     int fd;
-     _off_t pos;
-     int whence;
+_DEFUN (_lseek_r, (ptr, fd, pos, whence),
+     struct _reent *ptr _AND
+     int fd _AND
+     _off_t pos _AND
+     int whence)
 {
   _off_t ret;
 
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index c77310394..35138c6de 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -47,11 +47,11 @@ DESCRIPTION
 */
 
 int
-_open_r (ptr, file, flags, mode)
-     struct _reent *ptr;
-     _CONST char *file;
-     int flags;
-     int mode;
+_DEFUN (_open_r, (ptr, file, flags, mode),
+     struct _reent *ptr _AND
+     _CONST char *file _AND
+     int flags _AND
+     int mode)
 {
   int ret;
 
diff --git a/newlib/libc/reent/readr.c b/newlib/libc/reent/readr.c
index b05cbe2ab..38c1d9e39 100644
--- a/newlib/libc/reent/readr.c
+++ b/newlib/libc/reent/readr.c
@@ -46,11 +46,11 @@ DESCRIPTION
 */
 
 _ssize_t
-_read_r (ptr, fd, buf, cnt)
-     struct _reent *ptr;
-     int fd;
-     _PTR buf;
-     size_t cnt;
+_DEFUN (_read_r, (ptr, fd, buf, cnt),
+     struct _reent *ptr _AND
+     int fd _AND
+     _PTR buf _AND
+     size_t cnt)
 {
   _ssize_t ret;
 
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index 192796908..9300e8cd0 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -30,9 +30,9 @@ int errno;
 /* Interim cleanup code */
 
 void
-cleanup_glue (ptr, glue)
-     struct _reent *ptr;
-     struct _glue *glue;
+_DEFUN (cleanup_glue, (ptr, glue),
+     struct _reent *ptr _AND
+     struct _glue *glue)
 {
   /* Have to reclaim these in reverse order: */
   if (glue->_next)
@@ -42,8 +42,8 @@ cleanup_glue (ptr, glue)
 }
 
 void
-_reclaim_reent (ptr)
-     struct _reent *ptr;
+_DEFUN (_reclaim_reent, (ptr),
+     struct _reent *ptr)
 {
   if (ptr != _impure_ptr)
     {
@@ -121,7 +121,7 @@ _reclaim_reent (ptr)
  */
 
 void
-_wrapup_reent(struct _reent *ptr)
+_DEFUN (_wrapup_reent, (ptr), struct _reent *ptr)
 {
   register struct _atexit *p;
   register int n;
diff --git a/newlib/libc/reent/sbrkr.c b/newlib/libc/reent/sbrkr.c
index 8be82ddb1..b963307b6 100644
--- a/newlib/libc/reent/sbrkr.c
+++ b/newlib/libc/reent/sbrkr.c
@@ -49,9 +49,9 @@ DESCRIPTION
 */
 
 void *
-_sbrk_r (ptr, incr)
-     struct _reent *ptr;
-     ptrdiff_t incr;
+_DEFUN (_sbrk_r, (ptr, incr),
+     struct _reent *ptr _AND
+     ptrdiff_t incr)
 {
   char *ret;
   void *_sbrk(ptrdiff_t);
diff --git a/newlib/libc/reent/signalr.c b/newlib/libc/reent/signalr.c
index 3ac3e2cf8..7d8aa7d71 100644
--- a/newlib/libc/reent/signalr.c
+++ b/newlib/libc/reent/signalr.c
@@ -50,10 +50,10 @@ DESCRIPTION
 */
 
 int
-_kill_r (ptr, pid, sig)
-     struct _reent *ptr;
-     int pid;
-     int sig;
+_DEFUN (_kill_r, (ptr, pid, sig),
+     struct _reent *ptr _AND
+     int pid _AND
+     int sig)
 {
   int ret;
 
@@ -89,8 +89,8 @@ DESCRIPTION
 */
 
 int
-_getpid_r (ptr)
-     struct _reent *ptr;
+_DEFUN (_getpid_r, (ptr),
+     struct _reent *ptr)
 {
   int ret;
   ret = _getpid ();
diff --git a/newlib/libc/reent/signgam.c b/newlib/libc/reent/signgam.c
index 41d955d3a..bfb2dea51 100644
--- a/newlib/libc/reent/signgam.c
+++ b/newlib/libc/reent/signgam.c
@@ -8,7 +8,7 @@
 #ifndef _REENT_ONLY
 
 int *
-__signgam ()
+_DEFUN_VOID (__signgam)
 {
   return &_REENT_SIGNGAM(_REENT);
 }
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index 48a377344..9ad2bb209 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -52,10 +52,10 @@ DESCRIPTION
 */
 
 int
-_stat_r (ptr, file, pstat)
-     struct _reent *ptr;
-     _CONST char *file;
-     struct stat *pstat;
+_DEFUN (_stat_r, (ptr, file, pstat),
+     struct _reent *ptr _AND
+     _CONST char *file _AND
+     struct stat *pstat)
 {
   int ret;
 
diff --git a/newlib/libc/reent/timer.c b/newlib/libc/reent/timer.c
index 689595249..b604b90f3 100644
--- a/newlib/libc/reent/timer.c
+++ b/newlib/libc/reent/timer.c
@@ -55,9 +55,9 @@ DESCRIPTION
 */
 
 clock_t
-_times_r (ptr, ptms)
-     struct _reent *ptr;
-     struct tms *ptms;
+_DEFUN (_times_r, (ptr, ptms),
+     struct _reent *ptr _AND
+     struct tms *ptms)
 {
   clock_t ret;
 
@@ -97,10 +97,10 @@ DESCRIPTION
 */
 
 int
-_gettimeofday_r (ptr, ptimeval, ptimezone)
-     struct _reent *ptr;
-     struct timeval *ptimeval;
-     struct timezone *ptimezone;
+_DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
+     struct _reent *ptr _AND
+     struct timeval *ptimeval _AND
+     struct timezone *ptimezone)
 {
   int ret;
 
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index dbfc7e667..95b815f1b 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -44,9 +44,9 @@ DESCRIPTION
 */
 
 int
-_unlink_r (ptr, file)
-     struct _reent *ptr;
-     _CONST char *file;
+_DEFUN (_unlink_r, (ptr, file),
+     struct _reent *ptr _AND
+     _CONST char *file)
 {
   int ret;
 
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 7ede74fcc..128f7f7ac 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -46,11 +46,11 @@ DESCRIPTION
 */
 
 _ssize_t
-_write_r (ptr, fd, buf, cnt)
-     struct _reent *ptr;
-     int fd;
-     _CONST _PTR buf;
-     size_t cnt;
+_DEFUN (_write_r, (ptr, fd, buf, cnt),
+     struct _reent *ptr _AND
+     int fd _AND
+     _CONST _PTR buf _AND
+     size_t cnt)
 {
   _ssize_t ret;
 
diff --git a/newlib/libc/syscalls/sysclose.c b/newlib/libc/syscalls/sysclose.c
index 632364ac1..90f321fc0 100644
--- a/newlib/libc/syscalls/sysclose.c
+++ b/newlib/libc/syscalls/sysclose.c
@@ -3,8 +3,8 @@
 #include <reent.h>
 
 int
-close (fd)
-     int fd;
+_DEFUN (close, (fd),
+     int fd)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _close_r (_REENT, fd);
diff --git a/newlib/libc/syscalls/sysexecve.c b/newlib/libc/syscalls/sysexecve.c
index c5050472c..a43b47a0b 100644
--- a/newlib/libc/syscalls/sysexecve.c
+++ b/newlib/libc/syscalls/sysexecve.c
@@ -3,10 +3,10 @@
 #include <reent.h>
 
 int
-execve (name, argv, env)
-     char *name;
-     char **argv;
-     char **env;
+_DEFUN (execve, (name, argv, env),
+     char *name _AND
+     char **argv _AND
+     char **env)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _execve_r (_REENT, name, argv, env);
diff --git a/newlib/libc/syscalls/sysfcntl.c b/newlib/libc/syscalls/sysfcntl.c
index d72403f6a..5e6de7e77 100644
--- a/newlib/libc/syscalls/sysfcntl.c
+++ b/newlib/libc/syscalls/sysfcntl.c
@@ -5,10 +5,10 @@
 #include <errno.h>
 
 int
-fcntl (fd, flag, arg)
-     int fd;
-     int flag;
-     int arg;
+_DEFUN (fcntl, (fd, flag, arg),
+     int fd _AND
+     int flag _AND
+     int arg)
 {
 #ifdef HAVE_FCNTL
 # ifdef REENTRANT_SYSCALLS_PROVIDED
diff --git a/newlib/libc/syscalls/sysfork.c b/newlib/libc/syscalls/sysfork.c
index 9fe319ff0..96d23c7dd 100644
--- a/newlib/libc/syscalls/sysfork.c
+++ b/newlib/libc/syscalls/sysfork.c
@@ -7,7 +7,7 @@
 #include <reent.h>
 
 int
-fork ()
+_DEFUN_VOID (fork)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _fork_r (_REENT);
diff --git a/newlib/libc/syscalls/sysfstat.c b/newlib/libc/syscalls/sysfstat.c
index f167b3cd8..7d446e825 100644
--- a/newlib/libc/syscalls/sysfstat.c
+++ b/newlib/libc/syscalls/sysfstat.c
@@ -4,9 +4,9 @@
 #include <unistd.h>
 
 int
-fstat (fd, pstat)
-     int fd;
-     struct stat *pstat;
+_DEFUN (fstat, (fd, pstat),
+     int fd _AND
+     struct stat *pstat)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _fstat_r (_REENT, fd, pstat);
diff --git a/newlib/libc/syscalls/sysgetpid.c b/newlib/libc/syscalls/sysgetpid.c
index d7f75064d..794f5194b 100644
--- a/newlib/libc/syscalls/sysgetpid.c
+++ b/newlib/libc/syscalls/sysgetpid.c
@@ -3,7 +3,7 @@
 #include <reent.h>
 
 int
-getpid ()
+_DEFUN_VOID (getpid)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _getpid_r (_REENT);
diff --git a/newlib/libc/syscalls/sysgettod.c b/newlib/libc/syscalls/sysgettod.c
index 24849d5ce..9208a30b9 100644
--- a/newlib/libc/syscalls/sysgettod.c
+++ b/newlib/libc/syscalls/sysgettod.c
@@ -8,9 +8,9 @@ struct timeval;
 struct timezone;
 
 int
-gettimeofday (ptimeval, ptimezone)
-     struct timeval *ptimeval;
-     struct timezone *ptimezone;
+_DEFUN (gettimeofday, (ptimeval, ptimezone),
+     struct timeval *ptimeval _AND
+     struct timezone *ptimezone)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _gettimeofday_r (_REENT, ptimeval, ptimezone);
diff --git a/newlib/libc/syscalls/syskill.c b/newlib/libc/syscalls/syskill.c
index 4ee2f64df..15cfecba8 100644
--- a/newlib/libc/syscalls/syskill.c
+++ b/newlib/libc/syscalls/syskill.c
@@ -3,9 +3,9 @@
 #include <reent.h>
 
 int
-kill (pid, sig)
-     int pid;
-     int sig;
+_DEFUN (kill, (pid, sig),
+     int pid _AND
+     int sig)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _kill_r (_REENT, pid, sig);
diff --git a/newlib/libc/syscalls/syslink.c b/newlib/libc/syscalls/syslink.c
index 6abe184ea..df235eeaa 100644
--- a/newlib/libc/syscalls/syslink.c
+++ b/newlib/libc/syscalls/syslink.c
@@ -3,9 +3,9 @@
 #include <reent.h>
 
 int
-link (old, new)
-     char *old;
-     char *new;
+_DEFUN (link, (old, new),
+     char *old _AND
+     char *new)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _link_r (_REENT, old, new);
diff --git a/newlib/libc/syscalls/syslseek.c b/newlib/libc/syscalls/syslseek.c
index 57d6423e9..a1722471c 100644
--- a/newlib/libc/syscalls/syslseek.c
+++ b/newlib/libc/syscalls/syslseek.c
@@ -4,10 +4,10 @@
 #include <unistd.h>
 
 off_t
-lseek (fd, pos, whence)
-     int fd;
-     off_t pos;
-     int whence;
+_DEFUN (lseek, (fd, pos, whence),
+     int fd _AND
+     off_t pos _AND
+     int whence)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _lseek_r (_REENT, fd, pos, whence);
diff --git a/newlib/libc/syscalls/sysopen.c b/newlib/libc/syscalls/sysopen.c
index 6b3836f24..7e7df995f 100644
--- a/newlib/libc/syscalls/sysopen.c
+++ b/newlib/libc/syscalls/sysopen.c
@@ -10,7 +10,9 @@
 #include <stdarg.h>
 
 int
-open (const char *file, int flags, ...)
+_DEFUN (open, (file, flags, ...),
+        const char *file _AND
+        int flags _DOTS)
 {
   va_list ap;
   int ret;
diff --git a/newlib/libc/syscalls/sysread.c b/newlib/libc/syscalls/sysread.c
index bdb39323d..ae19f5b46 100644
--- a/newlib/libc/syscalls/sysread.c
+++ b/newlib/libc/syscalls/sysread.c
@@ -4,10 +4,10 @@
 #include <unistd.h>
 
 _READ_WRITE_RETURN_TYPE
-read (fd, buf, cnt)
-     int fd;
-     void *buf;
-     size_t cnt;
+_DEFUN (read, (fd, buf, cnt),
+     int fd _AND
+     void *buf _AND
+     size_t cnt)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _read_r (_REENT, fd, buf, cnt);
diff --git a/newlib/libc/syscalls/syssbrk.c b/newlib/libc/syscalls/syssbrk.c
index 91673c960..de368678e 100644
--- a/newlib/libc/syscalls/syssbrk.c
+++ b/newlib/libc/syscalls/syssbrk.c
@@ -7,8 +7,8 @@ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
 extern void *_sbrk (ptrdiff_t);
 
 void *
-sbrk (incr)
-     ptrdiff_t incr;
+_DEFUN (sbrk, (incr),
+     ptrdiff_t incr)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _sbrk_r (_REENT, incr);
diff --git a/newlib/libc/syscalls/sysstat.c b/newlib/libc/syscalls/sysstat.c
index 39a506169..e2247dcf0 100644
--- a/newlib/libc/syscalls/sysstat.c
+++ b/newlib/libc/syscalls/sysstat.c
@@ -4,9 +4,9 @@
 #include <unistd.h>
 
 int
-stat (file, pstat)
-     char *file;
-     struct stat *pstat;
+_DEFUN (stat, (file, pstat),
+     char *file _AND
+     struct stat *pstat)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _stat_r (_REENT, file, pstat);
diff --git a/newlib/libc/syscalls/systimes.c b/newlib/libc/syscalls/systimes.c
index f74d6fa15..353553be7 100644
--- a/newlib/libc/syscalls/systimes.c
+++ b/newlib/libc/syscalls/systimes.c
@@ -4,8 +4,8 @@
 #include <sys/times.h>
 
 clock_t
-times (buf)
-     struct tms *buf;
+_DEFUN (times, (buf),
+     struct tms *buf)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _times_r (_REENT, buf);
diff --git a/newlib/libc/syscalls/sysunlink.c b/newlib/libc/syscalls/sysunlink.c
index a910f96c2..ac04184f2 100644
--- a/newlib/libc/syscalls/sysunlink.c
+++ b/newlib/libc/syscalls/sysunlink.c
@@ -3,8 +3,8 @@
 #include <reent.h>
 
 int
-unlink (file)
-     char *file;
+_DEFUN (unlink, (file),
+        char *file)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _unlink_r (_REENT, file);
diff --git a/newlib/libc/syscalls/syswait.c b/newlib/libc/syscalls/syswait.c
index 86544fa0b..355906c37 100644
--- a/newlib/libc/syscalls/syswait.c
+++ b/newlib/libc/syscalls/syswait.c
@@ -3,8 +3,8 @@
 #include <reent.h>
 
 int
-wait (status)
-     int *status;
+_DEFUN (wait, (status),
+        int *status)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _wait_r (_REENT, status);
diff --git a/newlib/libc/syscalls/syswrite.c b/newlib/libc/syscalls/syswrite.c
index 00fc8a381..089975958 100644
--- a/newlib/libc/syscalls/syswrite.c
+++ b/newlib/libc/syscalls/syswrite.c
@@ -4,10 +4,10 @@
 #include <unistd.h>
 
 _READ_WRITE_RETURN_TYPE
-write (fd, buf, cnt)
-     int fd;
-     const void *buf;
-     size_t cnt;
+_DEFUN (write, (fd, buf, cnt),
+     int fd _AND
+     const void *buf _AND
+     size_t cnt)
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _write_r (_REENT, fd, buf, cnt);