ansification: remove _DEFUN

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

10 files changed, 102 insertions, 204 deletions

diff --git a/newlib/libc/xdr/xdr.c b/newlib/libc/xdr/xdr.c
index b60a89782..075093014 100644
--- a/newlib/libc/xdr/xdr.c
+++ b/newlib/libc/xdr/xdr.c
@@ -62,8 +62,7 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
  * Not a filter, but a convenient utility nonetheless
  */
 void
-_DEFUN (xdr_free, (proc, objp),
-        xdrproc_t proc,
+xdr_free (xdrproc_t proc,
 	void * objp)
 {
   XDR x;
@@ -86,8 +85,7 @@ xdr_void (void)
  * XDR integers
  */
 bool_t
-_DEFUN (xdr_int, (xdrs, ip),
-        XDR * xdrs,
+xdr_int (XDR * xdrs,
 	int * ip)
 {
 #if INT_MAX < LONG_MAX
@@ -121,8 +119,7 @@ _DEFUN (xdr_int, (xdrs, ip),
  * XDR unsigned integers
  */
 bool_t
-_DEFUN (xdr_u_int, (xdrs, up),
-        XDR * xdrs,
+xdr_u_int (XDR * xdrs,
 	u_int * up)
 {
 #if UINT_MAX < ULONG_MAX
@@ -156,8 +153,7 @@ _DEFUN (xdr_u_int, (xdrs, up),
  * XDR long integers
  */
 bool_t
-_DEFUN (xdr_long, (xdrs, lp),
-        XDR * xdrs,
+xdr_long (XDR * xdrs,
 	long * lp)
 {
   if ((xdrs->x_op == XDR_ENCODE)
@@ -177,8 +173,7 @@ _DEFUN (xdr_long, (xdrs, lp),
  * XDR unsigned long integers
  */
 bool_t
-_DEFUN (xdr_u_long, (xdrs, ulp),
-        XDR * xdrs,
+xdr_u_long (XDR * xdrs,
 	u_long * ulp)
 {
   switch (xdrs->x_op)
@@ -208,8 +203,7 @@ _DEFUN (xdr_u_long, (xdrs, ulp),
  * XDR 32-bit integers
  */
 bool_t
-_DEFUN (xdr_int32_t, (xdrs, int32_p),
-        XDR * xdrs,
+xdr_int32_t (XDR * xdrs,
 	int32_t * int32_p)
 {
   switch (xdrs->x_op)
@@ -230,8 +224,7 @@ _DEFUN (xdr_int32_t, (xdrs, int32_p),
  * XDR unsigned 32-bit integers
  */
 bool_t
-_DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
-        XDR * xdrs,
+xdr_u_int32_t (XDR * xdrs,
 	u_int32_t * u_int32_p)
 {
   switch (xdrs->x_op)
@@ -252,8 +245,7 @@ _DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
  * XDR unsigned 32-bit integers
  */
 bool_t
-_DEFUN (xdr_uint32_t, (xdrs, uint32_p),
-        XDR * xdrs,
+xdr_uint32_t (XDR * xdrs,
 	uint32_t * uint32_p)
 {
   switch (xdrs->x_op)
@@ -274,8 +266,7 @@ _DEFUN (xdr_uint32_t, (xdrs, uint32_p),
  * XDR short integers
  */
 bool_t
-_DEFUN (xdr_short, (xdrs, sp),
-        XDR * xdrs,
+xdr_short (XDR * xdrs,
 	short * sp)
 {
   long l;
@@ -302,8 +293,7 @@ _DEFUN (xdr_short, (xdrs, sp),
  * XDR unsigned short integers
  */
 bool_t
-_DEFUN (xdr_u_short, (xdrs, usp),
-        XDR * xdrs,
+xdr_u_short (XDR * xdrs,
 	u_short * usp)
 {
   long l;
@@ -331,8 +321,7 @@ _DEFUN (xdr_u_short, (xdrs, usp),
  * XDR 16-bit integers
  */
 bool_t
-_DEFUN (xdr_int16_t, (xdrs, int16_p),
-        XDR * xdrs,
+xdr_int16_t (XDR * xdrs,
 	int16_t * int16_p)
 {
   int32_t t;
@@ -359,8 +348,7 @@ _DEFUN (xdr_int16_t, (xdrs, int16_p),
  * XDR unsigned 16-bit integers
  */
 bool_t
-_DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
-        XDR * xdrs,
+xdr_u_int16_t (XDR * xdrs,
 	u_int16_t * u_int16_p)
 {
   uint32_t ut;
@@ -387,8 +375,7 @@ _DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
  * XDR unsigned 16-bit integers
  */
 bool_t
-_DEFUN (xdr_uint16_t, (xdrs, uint16_p),
-        XDR * xdrs,
+xdr_uint16_t (XDR * xdrs,
 	uint16_t * uint16_p)
 {
   uint32_t ut;
@@ -415,8 +402,7 @@ _DEFUN (xdr_uint16_t, (xdrs, uint16_p),
  * XDR 8-bit integers
  */
 bool_t
-_DEFUN (xdr_int8_t, (xdrs, int8_p),
-        XDR * xdrs,
+xdr_int8_t (XDR * xdrs,
 	int8_t * int8_p)
 {
   int32_t t;
@@ -443,8 +429,7 @@ _DEFUN (xdr_int8_t, (xdrs, int8_p),
  * XDR unsigned 8-bit integers
  */
 bool_t
-_DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
-        XDR * xdrs,
+xdr_u_int8_t (XDR * xdrs,
 	u_int8_t * u_int8_p)
 {
   uint32_t ut;
@@ -471,8 +456,7 @@ _DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
  * XDR unsigned 8-bit integers
  */
 bool_t
-_DEFUN (xdr_uint8_t, (xdrs, uint8_p),
-        XDR * xdrs,
+xdr_uint8_t (XDR * xdrs,
 	uint8_t * uint8_p)
 {
   uint32_t ut;
@@ -501,8 +485,7 @@ _DEFUN (xdr_uint8_t, (xdrs, uint8_p),
  * XDR a char
  */
 bool_t
-_DEFUN (xdr_char, (xdrs, cp),
-        XDR * xdrs,
+xdr_char (XDR * xdrs,
 	char * cp)
 {
   int i;
@@ -518,8 +501,7 @@ _DEFUN (xdr_char, (xdrs, cp),
  * XDR an unsigned char
  */
 bool_t
-_DEFUN (xdr_u_char, (xdrs, ucp),
-        XDR * xdrs,
+xdr_u_char (XDR * xdrs,
 	u_char * ucp)
 {
   u_int u;
@@ -535,8 +517,7 @@ _DEFUN (xdr_u_char, (xdrs, ucp),
  * XDR booleans
  */
 bool_t
-_DEFUN (xdr_bool, (xdrs, bp),
-        XDR * xdrs,
+xdr_bool (XDR * xdrs,
 	bool_t * bp)
 {
   long lb;
@@ -563,8 +544,7 @@ _DEFUN (xdr_bool, (xdrs, bp),
  * XDR enumerations
  */
 bool_t
-_DEFUN (xdr_enum, (xdrs, ep),
-        XDR * xdrs,
+xdr_enum (XDR * xdrs,
 	enum_t * ep)
 {
   enum sizecheck
@@ -607,8 +587,7 @@ _DEFUN (xdr_enum, (xdrs, ep),
  * cp points to the opaque object and cnt gives the byte length.
  */
 bool_t
-_DEFUN (xdr_opaque, (xdrs, cp, cnt),
-        XDR * xdrs,
+xdr_opaque (XDR * xdrs,
 	caddr_t cp,
 	u_int cnt)
 {
@@ -656,8 +635,7 @@ _DEFUN (xdr_opaque, (xdrs, cp, cnt),
  * If *cpp is NULL maxsize bytes are allocated
  */
 bool_t
-_DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
-        XDR * xdrs,
+xdr_bytes (XDR * xdrs,
 	char ** cpp,
 	u_int * sizep,
 	u_int maxsize)
@@ -711,8 +689,7 @@ _DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
  * Implemented here due to commonality of the object.
  */
 bool_t
-_DEFUN (xdr_netobj, (xdrs, np),
-        XDR * xdrs,
+xdr_netobj (XDR * xdrs,
 	struct netobj * np)
 {
   return (xdr_bytes (xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
@@ -734,8 +711,7 @@ _DEFUN (xdr_netobj, (xdrs, np),
  *   dfault:   default xdr routine
  */
 bool_t
-_DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
-        XDR * xdrs,
+xdr_union (XDR * xdrs,
         enum_t * dscmp,
         char * unp,
         const struct xdr_discrim * choices,
@@ -783,8 +759,7 @@ _DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
  * of the string as specified by a protocol.
  */
 bool_t
-_DEFUN (xdr_string, (xdrs, cpp, maxsize),
-        XDR * xdrs,
+xdr_string (XDR * xdrs,
         char ** cpp,
         u_int maxsize)
 {
@@ -861,8 +836,7 @@ _DEFUN (xdr_string, (xdrs, cpp, maxsize),
  * routines like clnt_call
  */
 bool_t
-_DEFUN (xdr_wrapstring, (xdrs, cpp),
-        XDR * xdrs,
+xdr_wrapstring (XDR * xdrs,
         char ** cpp)
 {
   return xdr_string (xdrs, cpp, LASTUNSIGNED);
@@ -882,8 +856,7 @@ _DEFUN (xdr_wrapstring, (xdrs, cpp),
  * XDR 64-bit integers
  */
 bool_t
-_DEFUN (xdr_int64_t, (xdrs, llp),
-        XDR * xdrs,
+xdr_int64_t (XDR * xdrs,
         int64_t * llp)
 {
   int32_t t1, t2;
@@ -913,8 +886,7 @@ _DEFUN (xdr_int64_t, (xdrs, llp),
  * XDR unsigned 64-bit integers
  */
 bool_t
-_DEFUN (xdr_u_int64_t, (xdrs, ullp),
-        XDR * xdrs,
+xdr_u_int64_t (XDR * xdrs,
         u_int64_t * ullp)
 {
   uint32_t t1, t2;
@@ -945,8 +917,7 @@ _DEFUN (xdr_u_int64_t, (xdrs, ullp),
  * XDR unsigned 64-bit integers
  */
 bool_t
-_DEFUN (xdr_uint64_t, (xdrs, ullp),
-        XDR * xdrs,
+xdr_uint64_t (XDR * xdrs,
         uint64_t * ullp)
 {
   uint32_t t1, t2;
@@ -978,8 +949,7 @@ _DEFUN (xdr_uint64_t, (xdrs, ullp),
  * XDR hypers
  */
 bool_t
-_DEFUN (xdr_hyper, (xdrs, llp),
-        XDR * xdrs,
+xdr_hyper (XDR * xdrs,
         quad_t * llp)
 {
   /*
@@ -994,8 +964,7 @@ _DEFUN (xdr_hyper, (xdrs, llp),
  * XDR unsigned hypers
  */
 bool_t
-_DEFUN (xdr_u_hyper, (xdrs, ullp),
-        XDR * xdrs,
+xdr_u_hyper (XDR * xdrs,
         u_quad_t * ullp)
 {
   /*
@@ -1010,8 +979,7 @@ _DEFUN (xdr_u_hyper, (xdrs, ullp),
  * XDR longlong_t's
  */
 bool_t
-_DEFUN (xdr_longlong_t, (xdrs, llp),
-        XDR * xdrs,
+xdr_longlong_t (XDR * xdrs,
         quad_t * llp)
 {
   /*
@@ -1026,8 +994,7 @@ _DEFUN (xdr_longlong_t, (xdrs, llp),
  * XDR u_longlong_t's
  */
 bool_t
-_DEFUN (xdr_u_longlong_t, (xdrs, ullp),
-        XDR * xdrs,
+xdr_u_longlong_t (XDR * xdrs,
         u_quad_t *ullp)
 {
   /*
diff --git a/newlib/libc/xdr/xdr_array.c b/newlib/libc/xdr/xdr_array.c
index 9c9748725..77e7164d2 100644
--- a/newlib/libc/xdr/xdr_array.c
+++ b/newlib/libc/xdr/xdr_array.c
@@ -54,8 +54,7 @@
  * xdr procedure to call to handle each element of the array.
  */
 bool_t
-_DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
-        XDR * xdrs,
+xdr_array (XDR * xdrs,
 	caddr_t * addrp,
 	u_int * sizep,
 	u_int maxsize,
@@ -138,8 +137,7 @@ _DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
  * > xdr_elem: routine to XDR each element
  */
 bool_t
-_DEFUN (xdr_vector, (xdrs, basep, nelem, elemsize, xdr_elem),
-        XDR * xdrs,
+xdr_vector (XDR * xdrs,
 	char *basep,
 	u_int nelem,
 	u_int elemsize,
diff --git a/newlib/libc/xdr/xdr_float.c b/newlib/libc/xdr/xdr_float.c
index 691e92965..e19b1ef9e 100644
--- a/newlib/libc/xdr/xdr_float.c
+++ b/newlib/libc/xdr/xdr_float.c
@@ -59,8 +59,7 @@
 #if defined(__IEEE_LITTLE_ENDIAN) || defined(__IEEE_BIG_ENDIAN)
 
 bool_t
-_DEFUN (xdr_float, (xdrs, fp),
-       XDR * xdrs,
+xdr_float (XDR * xdrs,
        float *fp)
 {
   switch (xdrs->x_op)
@@ -80,8 +79,7 @@ _DEFUN (xdr_float, (xdrs, fp),
 
 #if !defined(_DOUBLE_IS_32BITS)
 bool_t
-_DEFUN (xdr_double, (xdrs, dp),
-        XDR * xdrs,
+xdr_double (XDR * xdrs,
 	double *dp)
 {
   int32_t *i32p;
diff --git a/newlib/libc/xdr/xdr_float_vax.c b/newlib/libc/xdr/xdr_float_vax.c
index ed943480f..09c24b03e 100644
--- a/newlib/libc/xdr/xdr_float_vax.c
+++ b/newlib/libc/xdr/xdr_float_vax.c
@@ -81,8 +81,7 @@ static struct sgl_limits
 */
 
 bool_t
-_DEFUN (xdr_float, (xdrs, fp),
-       XDR * xdrs,
+xdr_float (XDR * xdrs,
        float *fp)
 {
   struct ieee_single is;
@@ -184,8 +183,7 @@ static struct dbl_limits
 */
 
 bool_t
-_DEFUN (xdr_double, (xdrs, dp),
-        XDR * xdrs,
+xdr_double (XDR * xdrs,
 	double *dp)
 {
   int32_t *lp;
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index 16d128774..3187ade74 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -101,8 +101,7 @@ static const struct xdr_ops xdrmem_ops_unaligned = {
  * memory buffer.
  */
 void
-_DEFUN (xdrmem_create, (xdrs, addr, size, op),
-        XDR * xdrs,
+xdrmem_create (XDR * xdrs,
 	caddr_t addr,
 	u_int size,
 	enum xdr_op op)
@@ -116,14 +115,12 @@ _DEFUN (xdrmem_create, (xdrs, addr, size, op),
 }
 
 static void
-_DEFUN (xdrmem_destroy, (xdrs),
-       XDR * xdrs)
+xdrmem_destroy (XDR * xdrs)
 {
 }
 
 static bool_t
-_DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
-        XDR * xdrs,
+xdrmem_getlong_aligned (XDR * xdrs,
 	long *lp)
 {
   if (xdrs->x_handy < sizeof (int32_t))
@@ -135,8 +132,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
-        XDR * xdrs,
+xdrmem_putlong_aligned (XDR * xdrs,
 	const long *lp)
 {
   if (xdrs->x_handy < sizeof (int32_t))
@@ -148,8 +144,7 @@ _DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
-        XDR * xdrs,
+xdrmem_getlong_unaligned (XDR * xdrs,
 	long *lp)
 {
   u_int32_t l;
@@ -164,8 +159,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
-        XDR * xdrs,
+xdrmem_putlong_unaligned (XDR * xdrs,
 	const long *lp)
 {
   u_int32_t l;
@@ -180,8 +174,7 @@ _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrmem_getbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrmem_getbytes (XDR * xdrs,
 	char *addr,
 	u_int len)
 {
@@ -194,8 +187,7 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
 }
 
 static bool_t
-_DEFUN (xdrmem_putbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrmem_putbytes (XDR * xdrs,
 	const char *addr,
 	u_int len)
 {
@@ -208,16 +200,14 @@ _DEFUN (xdrmem_putbytes, (xdrs, addr, len),
 }
 
 static u_int
-_DEFUN (xdrmem_getpos, (xdrs),
-        XDR * xdrs)
+xdrmem_getpos (XDR * xdrs)
 {
   /* XXX w/64-bit pointers, u_int not enough! */
   return (u_int) ((u_long) xdrs->x_private - (u_long) xdrs->x_base);
 }
 
 static bool_t
-_DEFUN (xdrmem_setpos, (xdrs, pos),
-        XDR * xdrs,
+xdrmem_setpos (XDR * xdrs,
 	u_int pos)
 {
   caddr_t newaddr = xdrs->x_base + pos;
@@ -236,8 +226,7 @@ _DEFUN (xdrmem_setpos, (xdrs, pos),
 }
 
 static int32_t *
-_DEFUN (xdrmem_inline_aligned, (xdrs, len),
-        XDR * xdrs,
+xdrmem_inline_aligned (XDR * xdrs,
 	u_int len)
 {
   int32_t *buf = 0;
@@ -252,16 +241,14 @@ _DEFUN (xdrmem_inline_aligned, (xdrs, len),
 }
 
 static int32_t *
-_DEFUN (xdrmem_inline_unaligned, (xdrs, len),
-        XDR * xdrs,
+xdrmem_inline_unaligned (XDR * xdrs,
 	u_int len)
 {
   return (0);
 }
 
 static bool_t
-_DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
-	XDR *xdrs,
+xdrmem_getint32_aligned (XDR *xdrs,
 	int32_t *ip)
 {
   if (xdrs->x_handy < sizeof(int32_t))
@@ -273,8 +260,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
-        XDR *xdrs,
+xdrmem_putint32_aligned (XDR *xdrs,
 	const int32_t *ip)
 {
   if (xdrs->x_handy < sizeof(int32_t))
@@ -286,8 +272,7 @@ _DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
-	XDR *xdrs,
+xdrmem_getint32_unaligned (XDR *xdrs,
 	int32_t *ip)
 {
   u_int32_t l;
@@ -302,8 +287,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrmem_putint32_unaligned, (xdrs, ip),
-        XDR *xdrs,
+xdrmem_putint32_unaligned (XDR *xdrs,
 	const int32_t *ip)
 {
   u_int32_t l;
diff --git a/newlib/libc/xdr/xdr_private.c b/newlib/libc/xdr/xdr_private.c
index 64eac9d23..cad6b7e82 100644
--- a/newlib/libc/xdr/xdr_private.c
+++ b/newlib/libc/xdr/xdr_private.c
@@ -26,8 +26,7 @@
 static xdr_vprintf_t xdr_vprintf = NULL;
 
 xdr_vprintf_t
-_DEFUN (xdr_set_vprintf, (fnptr),
-        xdr_vprintf_t fnptr)
+xdr_set_vprintf (xdr_vprintf_t fnptr)
 {
   xdr_vprintf_t tmp = xdr_vprintf;
   xdr_vprintf = fnptr;
@@ -35,8 +34,7 @@ _DEFUN (xdr_set_vprintf, (fnptr),
 }
 
 void
-_DEFUN (xdr_vwarnx, (format, ap),
-        const char *format,
+xdr_vwarnx (const char *format,
 	va_list ap)
 {
   if (xdr_vprintf)
@@ -48,8 +46,7 @@ _DEFUN (xdr_vwarnx, (format, ap),
 }
 
 void
-_DEFUN (xdr_warnx, (fmt),
-        const char *fmt, ...)
+xdr_warnx (const char *fmt, ...)
 {
   va_list ap;
   va_start (ap, fmt);
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index 367c3cb64..f46a9a3fa 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -169,8 +169,7 @@ bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int));
  * calls except that they take an opaque handle rather than an fd.
  */
 void
-_DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
-        XDR * xdrs,
+xdrrec_create (XDR * xdrs,
 	u_int sendsize,
 	u_int recvsize,
 	void *tcp_handle,
@@ -261,8 +260,7 @@ _DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
  */
 
 static bool_t
-_DEFUN (xdrrec_getlong, (xdrs, lp),
-        XDR * xdrs,
+xdrrec_getlong (XDR * xdrs,
 	long *lp)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -288,8 +286,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrrec_putlong, (xdrs, lp),
-        XDR * xdrs,
+xdrrec_putlong (XDR * xdrs,
 	const long *lp)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -313,8 +310,7 @@ _DEFUN (xdrrec_putlong, (xdrs, lp),
 }
 
 static bool_t                   /* must manage buffers, fragments, and records */
-_DEFUN (xdrrec_getbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrrec_getbytes (XDR * xdrs,
 	char *addr,
 	u_int len)
 {
@@ -343,8 +339,7 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
 }
 
 static bool_t
-_DEFUN (xdrrec_putbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrrec_putbytes (XDR * xdrs,
         const char *addr,
 	u_int len)
 {
@@ -371,8 +366,7 @@ _DEFUN (xdrrec_putbytes, (xdrs, addr, len),
 }
 
 static u_int
-_DEFUN (xdrrec_getpos, (xdrs),
-        XDR * xdrs)
+xdrrec_getpos (XDR * xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
   off_t pos;
@@ -398,8 +392,7 @@ _DEFUN (xdrrec_getpos, (xdrs),
 }
 
 static bool_t
-_DEFUN (xdrrec_setpos, (xdrs, pos),
-        XDR * xdrs,
+xdrrec_setpos (XDR * xdrs,
 	u_int pos)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -439,8 +432,7 @@ _DEFUN (xdrrec_setpos, (xdrs, pos),
 }
 
 static int32_t *
-_DEFUN (xdrrec_inline, (xdrs, len),
-        XDR * xdrs,
+xdrrec_inline (XDR * xdrs,
 	u_int len)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -482,8 +474,7 @@ _DEFUN (xdrrec_inline, (xdrs, len),
 }
 
 static void
-_DEFUN (xdrrec_destroy, (xdrs),
-        XDR * xdrs)
+xdrrec_destroy (XDR * xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
 
@@ -493,8 +484,7 @@ _DEFUN (xdrrec_destroy, (xdrs),
 }
 
 static bool_t
-_DEFUN (xdrrec_getint32, (xdrs, ip),
-        XDR *xdrs,
+xdrrec_getint32 (XDR *xdrs,
 	int32_t *ip)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -520,8 +510,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrrec_putint32, (xdrs, ip),
-        XDR *xdrs,
+xdrrec_putint32 (XDR *xdrs,
 	const int32_t *ip)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -553,8 +542,7 @@ _DEFUN (xdrrec_putint32, (xdrs, ip),
  * this procedure to guarantee proper record alignment.
  */
 bool_t
-_DEFUN (xdrrec_skiprecord, (xdrs),
-        XDR * xdrs)
+xdrrec_skiprecord (XDR * xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
   enum xprt_stat xstat;
@@ -592,8 +580,7 @@ _DEFUN (xdrrec_skiprecord, (xdrs),
  * after consuming the rest of the current record.
  */
 bool_t
-_DEFUN (xdrrec_eof, (xdrs),
-        XDR * xdrs)
+xdrrec_eof (XDR * xdrs)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
 
@@ -617,8 +604,7 @@ _DEFUN (xdrrec_eof, (xdrs),
  * pipelined procedure calls.)  TRUE => immmediate flush to tcp connection.
  */
 bool_t
-_DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
-        XDR * xdrs,
+xdrrec_endofrecord (XDR * xdrs,
 	bool_t sendnow)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -644,8 +630,7 @@ _DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
  * Return true if a record is available in the buffer, false if not.
  */
 bool_t
-_DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
-        XDR * xdrs,
+__xdrrec_getrec (XDR * xdrs,
 	enum xprt_stat * statp,
 	bool_t expectdata)
 {
@@ -737,8 +722,7 @@ _DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
 }
 
 bool_t
-_DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
-        XDR * xdrs,
+__xdrrec_setnonblock (XDR * xdrs,
 	int maxrec)
 {
   RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -754,8 +738,7 @@ _DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
  * Internal useful routines
  */
 static bool_t
-_DEFUN (flush_out, (rstrm, eor),
-        RECSTREAM * rstrm,
+flush_out (RECSTREAM * rstrm,
 	bool_t eor)
 {
   u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
@@ -775,8 +758,7 @@ _DEFUN (flush_out, (rstrm, eor),
 }
 
 static bool_t                   /* knows nothing about records!  Only about input buffers */
-_DEFUN (fill_input_buf, (rstrm),
-        RECSTREAM * rstrm)
+fill_input_buf (RECSTREAM * rstrm)
 {
   char *where;
   u_int32_t i;
@@ -798,8 +780,7 @@ _DEFUN (fill_input_buf, (rstrm),
 }
 
 static bool_t                   /* knows nothing about records!  Only about input buffers */
-_DEFUN (get_input_bytes, (rstrm, addr, len),
-        RECSTREAM * rstrm,
+get_input_bytes (RECSTREAM * rstrm,
 	char *addr,
 	size_t len)
 {
@@ -834,8 +815,7 @@ _DEFUN (get_input_bytes, (rstrm, addr, len),
 }
 
 static bool_t                   /* next two bytes of the input stream are treated as a header */
-_DEFUN (set_input_fragment, (rstrm),
-        RECSTREAM * rstrm)
+set_input_fragment (RECSTREAM * rstrm)
 {
   u_int32_t header;
 
@@ -860,8 +840,7 @@ _DEFUN (set_input_fragment, (rstrm),
 }
 
 static bool_t                   /* consumes input bytes; knows nothing about records! */
-_DEFUN (skip_input_bytes, (rstrm, cnt),
-        RECSTREAM * rstrm,
+skip_input_bytes (RECSTREAM * rstrm,
 	long cnt)
 {
   size_t current;
@@ -884,8 +863,7 @@ _DEFUN (skip_input_bytes, (rstrm, cnt),
 }
 
 static u_int
-_DEFUN (fix_buf_size, (s),
-        u_int s)
+fix_buf_size (u_int s)
 {
 
   if (s < 100)
@@ -897,8 +875,7 @@ _DEFUN (fix_buf_size, (s),
  * Reallocate the input buffer for a non-block stream.
  */
 static bool_t
-_DEFUN (realloc_stream, (rstrm, size),
-        RECSTREAM * rstrm,
+realloc_stream (RECSTREAM * rstrm,
 	int size)
 {
   ptrdiff_t diff;
diff --git a/newlib/libc/xdr/xdr_reference.c b/newlib/libc/xdr/xdr_reference.c
index 7a5f1d851..eba4b8355 100644
--- a/newlib/libc/xdr/xdr_reference.c
+++ b/newlib/libc/xdr/xdr_reference.c
@@ -56,8 +56,7 @@
  * proc is the routine to handle the referenced structure.
  */
 bool_t
-_DEFUN (xdr_reference, (xdrs, pp, size, proc),
-        XDR * xdrs,
+xdr_reference (XDR * xdrs,
 	caddr_t * pp,
 	u_int size,
 	xdrproc_t proc)
@@ -117,8 +116,7 @@ _DEFUN (xdr_reference, (xdrs, pp, size, proc),
  *
  */
 bool_t
-_DEFUN (xdr_pointer, (xdrs, objpp, obj_size, xdr_obj),
-        XDR * xdrs,
+xdr_pointer (XDR * xdrs,
 	char **objpp,
 	u_int obj_size,
 	xdrproc_t xdr_obj)
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index 427917640..bf02cf5e7 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -43,8 +43,7 @@
 
 /* ARGSUSED */
 static bool_t
-_DEFUN (x_putlong, (xdrs, longp),
-        XDR * xdrs,
+x_putlong (XDR * xdrs,
 	const long *longp)
 {
   xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -53,8 +52,7 @@ _DEFUN (x_putlong, (xdrs, longp),
 
 /* ARGSUSED */
 static bool_t
-_DEFUN (x_putbytes, (xdrs, bp, len),
-        XDR * xdrs,
+x_putbytes (XDR * xdrs,
 	const char *bp,
 	u_int len)
 {
@@ -63,16 +61,14 @@ _DEFUN (x_putbytes, (xdrs, bp, len),
 }
 
 static u_int
-_DEFUN (x_getpostn, (xdrs),
-        XDR * xdrs)
+x_getpostn (XDR * xdrs)
 {
   return xdrs->x_handy;
 }
 
 /* ARGSUSED */
 static bool_t
-_DEFUN (x_setpostn, (xdrs, pos),
-        XDR * xdrs,
+x_setpostn (XDR * xdrs,
 	u_int pos)
 {
   /* This is not allowed */
@@ -80,8 +76,7 @@ _DEFUN (x_setpostn, (xdrs, pos),
 }
 
 static int32_t *
-_DEFUN (x_inline, (xdrs, len),
-        XDR * xdrs,
+x_inline (XDR * xdrs,
 	u_int len)
 {
   if (len == 0)
@@ -118,8 +113,7 @@ harmless (void)
 }
 
 static void
-_DEFUN (x_destroy, (xdrs),
-        XDR * xdrs)
+x_destroy (XDR * xdrs)
 {
   xdrs->x_handy = 0;
   xdrs->x_base = 0;
@@ -132,8 +126,7 @@ _DEFUN (x_destroy, (xdrs),
 }
 
 static bool_t
-_DEFUN (x_putint32, (xdrs, int32p),
-        XDR *xdrs,
+x_putint32 (XDR *xdrs,
 	const int32_t *int32p)
 {
   xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -142,8 +135,7 @@ _DEFUN (x_putint32, (xdrs, int32p),
 
 
 unsigned long
-_DEFUN (xdr_sizeof, (func, data),
-        xdrproc_t func,
+xdr_sizeof (xdrproc_t func,
 	void *data)
 {
   XDR x;
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index e6513e5d0..784ac6c8b 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -83,8 +83,7 @@ static const struct xdr_ops xdrstdio_ops = {
  * Operation flag is set to op.
  */
 void
-_DEFUN (xdrstdio_create, (xdrs, file, op),
-        XDR * xdrs,
+xdrstdio_create (XDR * xdrs,
 	FILE * file,
 	enum xdr_op op)
 {
@@ -100,16 +99,14 @@ _DEFUN (xdrstdio_create, (xdrs, file, op),
  * Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create.
  */
 static void
-_DEFUN (xdrstdio_destroy, (xdrs),
-        XDR * xdrs)
+xdrstdio_destroy (XDR * xdrs)
 {
   (void) fflush ((FILE *) xdrs->x_private);
   /* XXX: should we close the file ?? */
 }
 
 static bool_t
-_DEFUN (xdrstdio_getlong, (xdrs, lp),
-        XDR * xdrs,
+xdrstdio_getlong (XDR * xdrs,
 	long *lp)
 {
   u_int32_t temp;
@@ -121,8 +118,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrstdio_putlong, (xdrs, lp),
-        XDR * xdrs,
+xdrstdio_putlong (XDR * xdrs,
 	const long *lp)
 {
   u_int32_t temp = htonl ((u_int32_t) * lp);
@@ -133,8 +129,7 @@ _DEFUN (xdrstdio_putlong, (xdrs, lp),
 }
 
 static bool_t
-_DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrstdio_getbytes (XDR * xdrs,
         char *addr,
 	u_int len)
 {
@@ -145,8 +140,7 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
 }
 
 static bool_t
-_DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
-        XDR * xdrs,
+xdrstdio_putbytes (XDR * xdrs,
         const char *addr,
 	u_int len)
 {
@@ -157,15 +151,13 @@ _DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
 }
 
 static u_int
-_DEFUN (xdrstdio_getpos, (xdrs),
-        XDR * xdrs)
+xdrstdio_getpos (XDR * xdrs)
 {
   return ((u_int) ftell ((FILE *) xdrs->x_private));
 }
 
 static bool_t
-_DEFUN (xdrstdio_setpos, (xdrs, pos),
-        XDR * xdrs,
+xdrstdio_setpos (XDR * xdrs,
         u_int pos)
 {
   return ((fseek ((FILE *) xdrs->x_private, (long) pos, 0) < 0) ?
@@ -174,8 +166,7 @@ _DEFUN (xdrstdio_setpos, (xdrs, pos),
 
 /* ARGSUSED */
 static int32_t *
-_DEFUN (xdrstdio_inline, (xdrs, len),
-        XDR * xdrs,
+xdrstdio_inline (XDR * xdrs,
 	u_int len)
 {
   /*
@@ -191,8 +182,7 @@ _DEFUN (xdrstdio_inline, (xdrs, len),
 }
 
 static bool_t
-_DEFUN (xdrstdio_getint32, (xdrs, ip),
-        XDR *xdrs,
+xdrstdio_getint32 (XDR *xdrs,
 	int32_t *ip)
 {
   int32_t temp;
@@ -204,8 +194,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip),
 }
 
 static bool_t
-_DEFUN (xdrstdio_putint32, (xdrs, ip),
-        XDR *xdrs,
+xdrstdio_putint32 (XDR *xdrs,
 	const int32_t *ip)
 {
   int32_t temp = htonl (*ip);