This is the mail archive of the cygwin-cvs@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[newlib-cygwin] ansification: remove _EXFUN, _EXFUN_NOTHROW


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=70ee6b17df9b055a05cdcc4d3fe1813d7b57e2d8

commit 70ee6b17df9b055a05cdcc4d3fe1813d7b57e2d8
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date:   Sun Dec 3 23:54:48 2017 -0600

    ansification: remove _EXFUN, _EXFUN_NOTHROW
    
    Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

Diff:
---
 libgloss/aarch64/syscalls.c                  |   2 +-
 libgloss/arm/syscalls.c                      |   2 +-
 libgloss/mcore/write.c                       |   2 +-
 libgloss/sparc_leon/asm-leon/clock.h         |   4 +-
 libgloss/write.c                             |   2 +-
 newlib/libc/ctype/local.h                    |   2 +-
 newlib/libc/iconv/ces/table.c                |   8 +-
 newlib/libc/iconv/lib/ucsconv.c              |   4 +-
 newlib/libc/include/_ansi.h                  |   9 -
 newlib/libc/include/alloca.h                 |   2 +-
 newlib/libc/include/assert.h                 |   8 +-
 newlib/libc/include/ctype.h                  |  32 +-
 newlib/libc/include/envlock.h                |   4 +-
 newlib/libc/include/getopt.h                 |  28 +-
 newlib/libc/include/iconv.h                  |  16 +-
 newlib/libc/include/ieeefp.h                 |  16 +-
 newlib/libc/include/libgen.h                 |   4 +-
 newlib/libc/include/locale.h                 |   8 +-
 newlib/libc/include/pthread.h                | 352 +++++++--------
 newlib/libc/include/rpc/xdr.h                | 102 ++---
 newlib/libc/include/setjmp.h                 |   6 +-
 newlib/libc/include/signal.h                 |  10 +-
 newlib/libc/include/spawn.h                  |  81 ++--
 newlib/libc/include/stdio.h                  | 638 +++++++++++++--------------
 newlib/libc/include/stdio_ext.h              |  18 +-
 newlib/libc/include/stdlib.h                 | 270 ++++++------
 newlib/libc/include/string.h                 | 104 ++---
 newlib/libc/include/sys/iconvnls.h           |  22 +-
 newlib/libc/include/sys/reent.h              |   4 +-
 newlib/libc/include/sys/resource.h           |   2 +-
 newlib/libc/include/sys/signal.h             |  47 +-
 newlib/libc/include/sys/stat.h               |  42 +-
 newlib/libc/include/sys/time.h               |  24 +-
 newlib/libc/include/sys/times.h              |   4 +-
 newlib/libc/include/sys/unistd.h             | 266 +++++------
 newlib/libc/include/time.h                   |  85 ++--
 newlib/libc/include/wchar.h                  | 326 +++++++-------
 newlib/libc/include/wctype.h                 |  36 +-
 newlib/libc/machine/powerpc/machine/malloc.h |  12 +-
 newlib/libc/machine/powerpc/machine/stdlib.h |  78 ++--
 newlib/libc/machine/spu/c99ppe.h             |   4 +-
 newlib/libc/misc/__dprintf.c                 |   8 +-
 newlib/libc/stdio/asnprintf.c                |   8 +-
 newlib/libc/stdio/asprintf.c                 |   8 +-
 newlib/libc/stdio/dprintf.c                  |   8 +-
 newlib/libc/stdio/fprintf.c                  |   8 +-
 newlib/libc/stdio/fscanf.c                   |   8 +-
 newlib/libc/stdio/fvwrite.h                  |   4 +-
 newlib/libc/stdio/getline.c                  |   2 +-
 newlib/libc/stdio/local.h                    | 106 ++---
 newlib/libc/stdio/nano-vfprintf.c            |  14 +-
 newlib/libc/stdio/nano-vfscanf.c             |  22 +-
 newlib/libc/stdio/printf.c                   |   8 +-
 newlib/libc/stdio/scanf.c                    |   8 +-
 newlib/libc/stdio/snprintf.c                 |   8 +-
 newlib/libc/stdio/sprintf.c                  |   8 +-
 newlib/libc/stdio/sscanf.c                   |   8 +-
 newlib/libc/stdio/vasnprintf.c               |   8 +-
 newlib/libc/stdio/vasprintf.c                |   8 +-
 newlib/libc/stdio/vdprintf.c                 |   8 +-
 newlib/libc/stdio/vfprintf.c                 |   8 +-
 newlib/libc/stdio/vfscanf.c                  |   6 +-
 newlib/libc/stdio/vfwprintf.c                |  12 +-
 newlib/libc/stdio/vprintf.c                  |   6 +-
 newlib/libc/stdio/vscanf.c                   |   6 +-
 newlib/libc/stdio/vsnprintf.c                |   8 +-
 newlib/libc/stdio/vsprintf.c                 |   8 +-
 newlib/libc/stdio/vsscanf.c                  |   8 +-
 newlib/libc/stdlib/local.h                   |   2 +-
 newlib/libc/stdlib/mbctype.h                 |   8 +-
 newlib/libc/stdlib/mprec.h                   |  46 +-
 newlib/libc/stdlib/rand48.h                  |   2 +-
 newlib/libc/stdlib/system.c                  |   2 +-
 newlib/libc/string/local.h                   |   2 +-
 newlib/libc/sys/arm/syscalls.c               |   2 +-
 newlib/libc/sys/linux/include/setjmp.h       |   8 +-
 newlib/libc/sys/linux/include/time.h         |  68 ++-
 newlib/libc/sys/linux/sys/signal.h           |  20 +-
 newlib/libc/sys/linux/sys/stat.h             |  18 +-
 newlib/libc/sys/linux/sys/stdio.h            |   2 +-
 newlib/libc/sys/linux/sys/string.h           |   2 +-
 newlib/libc/sys/linux/sys/time.h             |  12 +-
 newlib/libc/sys/linux/sys/unistd.h           | 178 ++++----
 newlib/libc/sys/linux/sys/utime.h            |   2 +-
 newlib/libc/sys/sparc64/sys/stat.h           |  12 +-
 newlib/libc/time/local.h                     |  10 +-
 newlib/libc/xdr/xdr_mem.c                    |  30 +-
 newlib/libc/xdr/xdr_private.h                |  10 +-
 newlib/libc/xdr/xdr_rec.c                    |  24 +-
 newlib/libc/xdr/xdr_stdio.c                  |  20 +-
 newlib/libm/mathfp/zmath.h                   |  24 +-
 newlib/libm/test/convert.c                   |   2 +-
 newlib/libm/test/math.c                      |  12 +-
 newlib/libm/test/test.h                      |  28 +-
 winsup/cygwin/include/attr/xattr.h           |  24 +-
 winsup/cygwin/include/pty.h                  |   8 +-
 winsup/cygwin/include/sys/stdio.h            |   4 +-
 winsup/cygwin/include/sys/utime.h            |   2 +-
 98 files changed, 1767 insertions(+), 1825 deletions(-)

diff --git a/libgloss/aarch64/syscalls.c b/libgloss/aarch64/syscalls.c
index 5aeb3d0..8198d3e 100644
--- a/libgloss/aarch64/syscalls.c
+++ b/libgloss/aarch64/syscalls.c
@@ -120,7 +120,7 @@ register char * stack_ptr asm ("sp");
 
 
 /* following is copied from libc/stdio/local.h to check std streams */
-extern void _EXFUN (__sinit, (struct _reent *));
+extern void __sinit (struct _reent *);
 #define CHECK_INIT(ptr) \
   do						\
     {						\
diff --git a/libgloss/arm/syscalls.c b/libgloss/arm/syscalls.c
index b76858f..f80615d 100644
--- a/libgloss/arm/syscalls.c
+++ b/libgloss/arm/syscalls.c
@@ -85,7 +85,7 @@ register char * stack_ptr asm ("sp");
 
 
 /* following is copied from libc/stdio/local.h to check std streams */
-extern void   _EXFUN(__sinit,(struct _reent *));
+extern void   __sinit (struct _reent *);
 #define CHECK_INIT(ptr) \
   do						\
     {						\
diff --git a/libgloss/mcore/write.c b/libgloss/mcore/write.c
index 87dca10..8b50fe2 100644
--- a/libgloss/mcore/write.c
+++ b/libgloss/mcore/write.c
@@ -14,7 +14,7 @@
  */
 #include "glue.h"
 
-extern int  _EXFUN (outbyte, (char x));
+extern int  outbyte (char x);
 
 /*
  * write -- write bytes to the serial port. Ignore fd, since
diff --git a/libgloss/sparc_leon/asm-leon/clock.h b/libgloss/sparc_leon/asm-leon/clock.h
index 189e942..7e33ae4 100644
--- a/libgloss/sparc_leon/asm-leon/clock.h
+++ b/libgloss/sparc_leon/asm-leon/clock.h
@@ -30,8 +30,8 @@
 #include <asm-leon/param.h>
 
 #ifndef __ASSEMBLER__
-int _EXFUN (gettimeofday, (struct timeval * __p, void *__tz));
-int _EXFUN (settimeofday, (const struct timeval *, const struct timezone *));
+int gettimeofday (struct timeval * __p, void *__tz);
+int settimeofday (const struct timeval *, const struct timezone *);
 void do_gettimeofday (struct timeval *tv);
 #endif
 
diff --git a/libgloss/write.c b/libgloss/write.c
index 4b25cfc..28b7ea3 100644
--- a/libgloss/write.c
+++ b/libgloss/write.c
@@ -14,7 +14,7 @@
  */
 #include "glue.h"
 
-extern int  _EXFUN (outbyte, (char x));
+extern int  outbyte (char x);
 
 /*
  * write -- write bytes to the serial port. Ignore fd, since
diff --git a/newlib/libc/ctype/local.h b/newlib/libc/ctype/local.h
index b3788e2..62d2b15 100644
--- a/newlib/libc/ctype/local.h
+++ b/newlib/libc/ctype/local.h
@@ -27,5 +27,5 @@
    to the requirements of the underlying OS. */
 #define _jp2uc(c) (c)
 #else
-wint_t _EXFUN (_jp2uc, (wint_t));
+wint_t _jp2uc (wint_t);
 #endif
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 2b844d5..c8ef218 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -57,17 +57,17 @@
  */
 
 static ucs2_t
-_EXFUN(find_code_size, (ucs2_t code, const __uint16_t *tblp));
+find_code_size (ucs2_t code, const __uint16_t *tblp);
 
 static __inline ucs2_t
-_EXFUN(find_code_speed, (ucs2_t code, const __uint16_t *tblp));
+find_code_speed (ucs2_t code, const __uint16_t *tblp);
 
 static __inline ucs2_t
-_EXFUN(find_code_speed_8bit, (ucs2_t code, const unsigned char *tblp));
+find_code_speed_8bit (ucs2_t code, const unsigned char *tblp);
 
 #ifdef _ICONV_ENABLE_EXTERNAL_CCS
 static const iconv_ccs_desc_t *
-_EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
+load_file (struct _reent *rptr, const char *name, int direction);
 #endif
 
 /*
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index 8c3d190..59f4f99 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -36,8 +36,8 @@
 static int fake_data;
 
 static int 
-_EXFUN(find_encoding_name, (const char *searchee,
-                            const char **names));
+find_encoding_name (const char *searchee,
+                            const char **names);
 
 
 /*
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 3e24900..e2737ed 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -47,19 +47,10 @@
 #endif
 
 #ifdef _HAVE_STDC
-#ifdef __CYGWIN__
-#define	_EXFUN_NOTHROW(name, proto)	__cdecl name proto _NOTHROW
-#define	_EXFUN(name, proto)		__cdecl name proto
-#else
-#define	_EXFUN_NOTHROW(name, proto)	name proto _NOTHROW
-#define	_EXFUN(name, proto)		name proto
-#endif
 #ifndef _LONG_DOUBLE
 #define _LONG_DOUBLE long double
 #endif
 #else	
-#define	_EXFUN(name, proto)		name()
-#define	_EXFUN_NOTHROW(name, proto)	name()
 #define _LONG_DOUBLE double
 #endif
 
diff --git a/newlib/libc/include/alloca.h b/newlib/libc/include/alloca.h
index 2ea0fd9..5d36318 100644
--- a/newlib/libc/include/alloca.h
+++ b/newlib/libc/include/alloca.h
@@ -15,7 +15,7 @@
 #ifdef __GNUC__
 #define alloca(size) __builtin_alloca(size)
 #else
-void * _EXFUN(alloca,(size_t));
+void * alloca (size_t);
 #endif
 
 #endif
diff --git a/newlib/libc/include/assert.h b/newlib/libc/include/assert.h
index 91bb040..b9e5e9b 100644
--- a/newlib/libc/include/assert.h
+++ b/newlib/libc/include/assert.h
@@ -36,10 +36,10 @@ extern "C" {
 # endif /* !__ASSERT_FUNC */
 #endif /* !NDEBUG */
 
-void _EXFUN(__assert, (const char *, int, const char *)
-	    _ATTRIBUTE ((__noreturn__)));
-void _EXFUN(__assert_func, (const char *, int, const char *, const char *)
-	    _ATTRIBUTE ((__noreturn__)));
+void __assert (const char *, int, const char *)
+	    _ATTRIBUTE ((__noreturn__));
+void __assert_func (const char *, int, const char *, const char *)
+	    _ATTRIBUTE ((__noreturn__));
 
 #if __STDC_VERSION__ >= 201112L && !defined __cplusplus
 # define static_assert _Static_assert
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index 0d705e1..f74b349 100644
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -10,27 +10,27 @@
 
 _BEGIN_STD_C
 
-int _EXFUN(isalnum, (int __c));
-int _EXFUN(isalpha, (int __c));
-int _EXFUN(iscntrl, (int __c));
-int _EXFUN(isdigit, (int __c));
-int _EXFUN(isgraph, (int __c));
-int _EXFUN(islower, (int __c));
-int _EXFUN(isprint, (int __c));
-int _EXFUN(ispunct, (int __c));
-int _EXFUN(isspace, (int __c));
-int _EXFUN(isupper, (int __c));
-int _EXFUN(isxdigit,(int __c));
-int _EXFUN(tolower, (int __c));
-int _EXFUN(toupper, (int __c));
+int isalnum (int __c);
+int isalpha (int __c);
+int iscntrl (int __c);
+int isdigit (int __c);
+int isgraph (int __c);
+int islower (int __c);
+int isprint (int __c);
+int ispunct (int __c);
+int isspace (int __c);
+int isupper (int __c);
+int isxdigit (int __c);
+int tolower (int __c);
+int toupper (int __c);
 
 #if __ISO_C_VISIBLE >= 1999
-int _EXFUN(isblank, (int __c));
+int isblank (int __c);
 #endif
 
 #if __MISC_VISIBLE || __XSI_VISIBLE
-int _EXFUN(isascii, (int __c));
-int _EXFUN(toascii, (int __c));
+int isascii (int __c);
+int toascii (int __c);
 #define _tolower(__c) ((unsigned char)(__c) - 'A' + 'a')
 #define _toupper(__c) ((unsigned char)(__c) - 'a' + 'A')
 #endif
diff --git a/newlib/libc/include/envlock.h b/newlib/libc/include/envlock.h
index 9bb6a81..799cf7f 100644
--- a/newlib/libc/include/envlock.h
+++ b/newlib/libc/include/envlock.h
@@ -9,7 +9,7 @@
 #define ENV_LOCK __env_lock(reent_ptr)
 #define ENV_UNLOCK __env_unlock(reent_ptr)
 
-void _EXFUN(__env_lock,(struct _reent *reent));
-void _EXFUN(__env_unlock,(struct _reent *reent));
+void __env_lock (struct _reent *reent);
+void __env_unlock (struct _reent *reent);
 
 #endif /* _INCLUDE_ENVLOCK_H_ */
diff --git a/newlib/libc/include/getopt.h b/newlib/libc/include/getopt.h
index e12d253..9bced42 100644
--- a/newlib/libc/include/getopt.h
+++ b/newlib/libc/include/getopt.h
@@ -153,31 +153,25 @@ extern "C"
   extern int optopt;
 
   /* function prototypes */
-  int _EXFUN (getopt,
-	      (int __argc, char *const __argv[], const char *__optstring));
+  int getopt (int __argc, char *const __argv[], const char *__optstring);
 
-  int _EXFUN (getopt_long,
-	      (int __argc, char *const __argv[], const char *__shortopts,
-	       const struct option * __longopts, int *__longind));
+  int getopt_long (int __argc, char *const __argv[], const char *__shortopts,
+	       const struct option * __longopts, int *__longind);
 
-  int _EXFUN (getopt_long_only,
-	      (int __argc, char *const __argv[], const char *__shortopts,
-	       const struct option * __longopts, int *__longind));
+  int getopt_long_only (int __argc, char *const __argv[], const char *__shortopts,
+	       const struct option * __longopts, int *__longind);
 
 #ifdef __need_getopt_newlib
-  int _EXFUN (__getopt_r,
-	      (int __argc, char *const __argv[], const char *__optstring,
-	       struct getopt_data * __data));
+  int __getopt_r (int __argc, char *const __argv[], const char *__optstring,
+	       struct getopt_data * __data);
 
-  int _EXFUN (__getopt_long_r,
-	      (int __argc, char *const __argv[], const char *__shortopts,
+  int __getopt_long_r (int __argc, char *const __argv[], const char *__shortopts,
 	       const struct option * __longopts, int *__longind,
-	       struct getopt_data * __data));
+	       struct getopt_data * __data);
 
-  int _EXFUN (__getopt_long_only_r,
-	      (int __argc, char *const __argv[], const char *__shortopts,
+  int __getopt_long_only_r (int __argc, char *const __argv[], const char *__shortopts,
 	       const struct option * __longopts, int *__longind,
-	       struct getopt_data * __data));
+	       struct getopt_data * __data);
 #endif /* __need_getopt_newlib */
 
 #ifdef __cplusplus
diff --git a/newlib/libc/include/iconv.h b/newlib/libc/include/iconv.h
index e19f73d..37feb88 100644
--- a/newlib/libc/include/iconv.h
+++ b/newlib/libc/include/iconv.h
@@ -38,25 +38,25 @@ _BEGIN_STD_C
 
 #ifndef _REENT_ONLY
 iconv_t
-_EXFUN(iconv_open, (const char *, const char *));
+iconv_open (const char *, const char *);
 
 size_t
-_EXFUN(iconv, (iconv_t, char **__restrict, size_t *__restrict, 
-               char **__restrict, size_t *__restrict));
+iconv (iconv_t, char **__restrict, size_t *__restrict, 
+               char **__restrict, size_t *__restrict);
 
 int
-_EXFUN(iconv_close, (iconv_t));
+iconv_close (iconv_t);
 #endif
 
 iconv_t
-_EXFUN(_iconv_open_r, (struct _reent *, const char *, const char *));
+_iconv_open_r (struct _reent *, const char *, const char *);
 
 size_t
-_EXFUN(_iconv_r, (struct _reent *, iconv_t, const char **,
-                  size_t *, char **, size_t *));
+_iconv_r (struct _reent *, iconv_t, const char **,
+                  size_t *, char **, size_t *);
 
 int
-_EXFUN(_iconv_close_r, (struct _reent *, iconv_t));
+_iconv_close_r (struct _reent *, iconv_t);
 
 _END_STD_C
 
diff --git a/newlib/libc/include/ieeefp.h b/newlib/libc/include/ieeefp.h
index 2c04284..2d6421a 100644
--- a/newlib/libc/include/ieeefp.h
+++ b/newlib/libc/include/ieeefp.h
@@ -215,8 +215,8 @@ typedef int fp_rnd;
 #define FP_RP 2		/* Round up 			*/
 #define FP_RZ 3		/* Round to zero (trunate) 	*/
 
-fp_rnd _EXFUN(fpgetround,(void));
-fp_rnd _EXFUN(fpsetround, (fp_rnd));
+fp_rnd fpgetround (void);
+fp_rnd fpsetround (fp_rnd);
 
 /* EXCEPTIONS */
 
@@ -227,10 +227,10 @@ typedef int fp_except;
 #define FP_X_UFL 0x02	/* Underflow exception		*/
 #define FP_X_IMP 0x01	/* imprecise exception		*/
 
-fp_except _EXFUN(fpgetmask,(void));
-fp_except _EXFUN(fpsetmask,(fp_except));
-fp_except _EXFUN(fpgetsticky,(void));
-fp_except _EXFUN(fpsetsticky, (fp_except));
+fp_except fpgetmask (void);
+fp_except fpsetmask (fp_except);
+fp_except fpgetsticky (void);
+fp_except fpsetsticky (fp_except);
 
 /* INTEGER ROUNDING */
 
@@ -238,8 +238,8 @@ typedef int fp_rdi;
 #define FP_RDI_TOZ 0	/* Round to Zero 		*/
 #define FP_RDI_RD  1	/* Follow float mode		*/
 
-fp_rdi _EXFUN(fpgetroundtoi,(void));
-fp_rdi _EXFUN(fpsetroundtoi,(fp_rdi));
+fp_rdi fpgetroundtoi (void);
+fp_rdi fpsetroundtoi (fp_rdi);
 
 #define __IEEE_DBL_EXPBIAS 1023
 #define __IEEE_FLT_EXPBIAS 127
diff --git a/newlib/libc/include/libgen.h b/newlib/libc/include/libgen.h
index 3c717c5..414b5aa 100644
--- a/newlib/libc/include/libgen.h
+++ b/newlib/libc/include/libgen.h
@@ -26,8 +26,8 @@ extern "C" {
    sure here. */
 #undef basename
 #define basename __xpg_basename
-char      *_EXFUN(basename,     (char *)) __asm__(__ASMNAME("basename"));
-char      *_EXFUN(dirname,     (char *));
+char      *basename (char *) __asm__(__ASMNAME("basename"));
+char      *dirname (char *);
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h
index 8ba88a9..d11eb00 100644
--- a/newlib/libc/include/locale.h
+++ b/newlib/libc/include/locale.h
@@ -68,8 +68,8 @@ struct lconv
 };
 
 struct _reent;
-char *_EXFUN(_setlocale_r,(struct _reent *, int, const char *));
-struct lconv *_EXFUN(_localeconv_r,(struct _reent *));
+char *_setlocale_r (struct _reent *, int, const char *);
+struct lconv *_localeconv_r (struct _reent *);
 
 struct __locale_t *_newlocale_r (struct _reent *, int, const char *,
 				 struct __locale_t *);
@@ -79,8 +79,8 @@ struct __locale_t *_uselocale_r (struct _reent *, struct __locale_t *);
 
 #ifndef _REENT_ONLY
 
-char *_EXFUN(setlocale,(int, const char *));
-struct lconv *_EXFUN(localeconv,(void));
+char *setlocale (int, const char *);
+struct lconv *localeconv (void);
 
 #if __POSIX_VISIBLE >= 200809
 locale_t newlocale (int, const char *, locale_t);
diff --git a/newlib/libc/include/pthread.h b/newlib/libc/include/pthread.h
index 493eafd..3dee1c9 100644
--- a/newlib/libc/include/pthread.h
+++ b/newlib/libc/include/pthread.h
@@ -39,34 +39,32 @@ struct _pthread_cleanup_context {
 };
 
 /* Register Fork Handlers */
-int	_EXFUN(pthread_atfork,(void (*prepare)(void), void (*parent)(void),
-                   void (*child)(void)));
+int	pthread_atfork (void (*prepare)(void), void (*parent)(void),
+                   void (*child)(void));
           
 /* Mutex Initialization Attributes, P1003.1c/Draft 10, p. 81 */
 
-int	_EXFUN(pthread_mutexattr_init, (pthread_mutexattr_t *__attr));
-int	_EXFUN(pthread_mutexattr_destroy, (pthread_mutexattr_t *__attr));
-int	_EXFUN(pthread_mutexattr_getpshared,
-		(const pthread_mutexattr_t *__attr, int  *__pshared));
-int	_EXFUN(pthread_mutexattr_setpshared,
-		(pthread_mutexattr_t *__attr, int __pshared));
+int	pthread_mutexattr_init (pthread_mutexattr_t *__attr);
+int	pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
+int	pthread_mutexattr_getpshared (const pthread_mutexattr_t *__attr,
+				      int  *__pshared);
+int	pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
+				      int __pshared);
 
 #if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
 
 /* Single UNIX Specification 2 Mutex Attributes types */
 
-int _EXFUN(pthread_mutexattr_gettype,
-		(const pthread_mutexattr_t *__attr, int *__kind));
-int _EXFUN(pthread_mutexattr_settype,
-		(pthread_mutexattr_t *__attr, int __kind));
+int pthread_mutexattr_gettype (const pthread_mutexattr_t *__attr, int *__kind);
+int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind);
 
 #endif
 
 /* Initializing and Destroying a Mutex, P1003.1c/Draft 10, p. 87 */
 
-int	_EXFUN(pthread_mutex_init,
-	(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__attr));
-int	_EXFUN(pthread_mutex_destroy, (pthread_mutex_t *__mutex));
+int	pthread_mutex_init (pthread_mutex_t *__mutex,
+			    const pthread_mutexattr_t *__attr);
+int	pthread_mutex_destroy (pthread_mutex_t *__mutex);
 
 /* This is used to statically initialize a pthread_mutex_t. Example:
   
@@ -78,38 +76,36 @@ int	_EXFUN(pthread_mutex_destroy, (pthread_mutex_t *__mutex));
 /*  Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
     NOTE: P1003.4b/D8 adds pthread_mutex_timedlock(), p. 29 */
 
-int	_EXFUN(pthread_mutex_lock, (pthread_mutex_t *__mutex));
-int	_EXFUN(pthread_mutex_trylock, (pthread_mutex_t *__mutex));
-int	_EXFUN(pthread_mutex_unlock, (pthread_mutex_t *__mutex));
+int	pthread_mutex_lock (pthread_mutex_t *__mutex);
+int	pthread_mutex_trylock (pthread_mutex_t *__mutex);
+int	pthread_mutex_unlock (pthread_mutex_t *__mutex);
 
 #if defined(_POSIX_TIMEOUTS)
 
-int	_EXFUN(pthread_mutex_timedlock,
-	(pthread_mutex_t *__mutex, const struct timespec *__timeout));
+int	pthread_mutex_timedlock (pthread_mutex_t *__mutex,
+				 const struct timespec *__timeout);
 
 #endif /* _POSIX_TIMEOUTS */
 
 /* Condition Variable Initialization Attributes, P1003.1c/Draft 10, p. 96 */
  
-int	_EXFUN(pthread_condattr_init, (pthread_condattr_t *__attr));
-int	_EXFUN(pthread_condattr_destroy, (pthread_condattr_t *__attr));
-
-int	_EXFUN(pthread_condattr_getclock,
-		(const pthread_condattr_t *__restrict __attr,
-              clockid_t *__restrict __clock_id));
-int	_EXFUN(pthread_condattr_setclock,
-		(pthread_condattr_t *__attr, clockid_t __clock_id));
-
-int	_EXFUN(pthread_condattr_getpshared,
-		(const pthread_condattr_t *__attr, int *__pshared));
-int	_EXFUN(pthread_condattr_setpshared,
-		(pthread_condattr_t *__attr, int __pshared));
+int	pthread_condattr_init (pthread_condattr_t *__attr);
+int	pthread_condattr_destroy (pthread_condattr_t *__attr);
+
+int	pthread_condattr_getclock (const pthread_condattr_t *__restrict __attr,
+				   clockid_t *__restrict __clock_id);
+int	pthread_condattr_setclock (pthread_condattr_t *__attr,
+				   clockid_t __clock_id);
+
+int	pthread_condattr_getpshared (const pthread_condattr_t *__attr,
+				     int *__pshared);
+int	pthread_condattr_setpshared (pthread_condattr_t *__attr, int __pshared);
  
 /* Initializing and Destroying a Condition Variable, P1003.1c/Draft 10, p. 87 */
  
-int	_EXFUN(pthread_cond_init,
-	(pthread_cond_t *__cond, const pthread_condattr_t *__attr));
-int	_EXFUN(pthread_cond_destroy, (pthread_cond_t *__mutex));
+int	pthread_cond_init (pthread_cond_t *__cond,
+			   const pthread_condattr_t *__attr);
+int	pthread_cond_destroy (pthread_cond_t *__mutex);
  
 /* This is used to statically initialize a pthread_cond_t. Example:
   
@@ -120,53 +116,50 @@ int	_EXFUN(pthread_cond_destroy, (pthread_cond_t *__mutex));
  
 /* Broadcasting and Signaling a Condition, P1003.1c/Draft 10, p. 101 */
  
-int	_EXFUN(pthread_cond_signal, (pthread_cond_t *__cond));
-int	_EXFUN(pthread_cond_broadcast, (pthread_cond_t *__cond));
+int	pthread_cond_signal (pthread_cond_t *__cond);
+int	pthread_cond_broadcast (pthread_cond_t *__cond);
  
 /* Waiting on a Condition, P1003.1c/Draft 10, p. 105 */
  
-int	_EXFUN(pthread_cond_wait,
-	(pthread_cond_t *__cond, pthread_mutex_t *__mutex));
+int	pthread_cond_wait (pthread_cond_t *__cond, pthread_mutex_t *__mutex);
  
-int	_EXFUN(pthread_cond_timedwait,
-		(pthread_cond_t *__cond, pthread_mutex_t *__mutex,
-		const struct timespec *__abstime));
+int	pthread_cond_timedwait (pthread_cond_t *__cond,
+				pthread_mutex_t *__mutex,
+				const struct timespec *__abstime);
  
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 
 /* Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120 */
 
-int	_EXFUN(pthread_attr_setscope,
-		(pthread_attr_t *__attr, int __contentionscope));
-int	_EXFUN(pthread_attr_getscope,
-	(const pthread_attr_t *__attr, int *__contentionscope));
-int	_EXFUN(pthread_attr_setinheritsched,
-	(pthread_attr_t *__attr, int __inheritsched));
-int	_EXFUN(pthread_attr_getinheritsched,
-	(const pthread_attr_t *__attr, int *__inheritsched));
-int	_EXFUN(pthread_attr_setschedpolicy,
-	(pthread_attr_t *__attr, int __policy));
-int	_EXFUN(pthread_attr_getschedpolicy,
-	(const pthread_attr_t *__attr, int *__policy));
+int	pthread_attr_setscope (pthread_attr_t *__attr, int __contentionscope);
+int	pthread_attr_getscope (const pthread_attr_t *__attr,
+			       int *__contentionscope);
+int	pthread_attr_setinheritsched (pthread_attr_t *__attr,
+				      int __inheritsched);
+int	pthread_attr_getinheritsched (const pthread_attr_t *__attr,
+				      int *__inheritsched);
+int	pthread_attr_setschedpolicy (pthread_attr_t *__attr, int __policy);
+int	pthread_attr_getschedpolicy (const pthread_attr_t *__attr,
+				     int *__policy);
 
 #endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
 
-int	_EXFUN(pthread_attr_setschedparam,
-	(pthread_attr_t *__attr, const struct sched_param *__param));
-int	_EXFUN(pthread_attr_getschedparam,
-	(const pthread_attr_t *__attr, struct sched_param *__param));
+int	pthread_attr_setschedparam (pthread_attr_t *__attr,
+				    const struct sched_param *__param);
+int	pthread_attr_getschedparam (const pthread_attr_t *__attr,
+				    struct sched_param *__param);
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 
 /* Dynamic Thread Scheduling Parameters Access, P1003.1c/Draft 10, p. 124 */
 
-int	_EXFUN(pthread_getschedparam,
-	(pthread_t __pthread, int *__policy, struct sched_param *__param));
-int	_EXFUN(pthread_setschedparam,
-	(pthread_t __pthread, int __policy, struct sched_param *__param));
+int	pthread_getschedparam (pthread_t __pthread, int *__policy,
+			       struct sched_param *__param);
+int	pthread_setschedparam (pthread_t __pthread, int __policy,
+			       struct sched_param *__param);
 
 /* Set Scheduling Priority of a Thread */
-int	_EXFUN(pthread_setschedprio, (pthread_t thread, int prio));
+int	pthread_setschedprio (pthread_t thread, int prio);
 
 #endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
 
@@ -180,14 +173,14 @@ int	pthread_setname_np(pthread_t, const char *) __nonnull((2));
 
 /* Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128 */
  
-int	_EXFUN(pthread_mutexattr_setprotocol,
-	(pthread_mutexattr_t *__attr, int __protocol));
-int	_EXFUN(pthread_mutexattr_getprotocol,
-	(const pthread_mutexattr_t *__attr, int *__protocol));
-int	_EXFUN(pthread_mutexattr_setprioceiling,
-	(pthread_mutexattr_t *__attr, int __prioceiling));
-int	_EXFUN(pthread_mutexattr_getprioceiling,
-	(const pthread_mutexattr_t *__attr, int *__prioceiling));
+int	pthread_mutexattr_setprotocol (pthread_mutexattr_t *__attr,
+				       int __protocol);
+int	pthread_mutexattr_getprotocol (const pthread_mutexattr_t *__attr,
+				       int *__protocol);
+int	pthread_mutexattr_setprioceiling (pthread_mutexattr_t *__attr,
+					  int __prioceiling);
+int	pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *__attr,
+					  int *__prioceiling);
 
 #endif /* _POSIX_THREAD_PRIO_INHERIT || _POSIX_THREAD_PRIO_PROTECT */
 
@@ -195,37 +188,33 @@ int	_EXFUN(pthread_mutexattr_getprioceiling,
 
 /* Change the Priority Ceiling of a Mutex, P1003.1c/Draft 10, p. 131 */
 
-int	_EXFUN(pthread_mutex_setprioceiling,
-	(pthread_mutex_t *__mutex, int __prioceiling, int *__old_ceiling));
-int	_EXFUN(pthread_mutex_getprioceiling,
-	(pthread_mutex_t *__mutex, int *__prioceiling));
+int	pthread_mutex_setprioceiling (pthread_mutex_t *__mutex,
+				      int __prioceiling, int *__old_ceiling);
+int	pthread_mutex_getprioceiling (pthread_mutex_t *__mutex,
+				      int *__prioceiling);
 
 #endif /* _POSIX_THREAD_PRIO_PROTECT */
 
 /* Thread Creation Attributes, P1003.1c/Draft 10, p, 140 */
 
-int	_EXFUN(pthread_attr_init, (pthread_attr_t *__attr));
-int	_EXFUN(pthread_attr_destroy, (pthread_attr_t *__attr));
-int	_EXFUN(pthread_attr_setstack, (pthread_attr_t *attr,
-	void *__stackaddr, size_t __stacksize));
-int	_EXFUN(pthread_attr_getstack, (const pthread_attr_t *attr,
-	void **__stackaddr, size_t *__stacksize));
-int	_EXFUN(pthread_attr_getstacksize,
-	(const pthread_attr_t *__attr, size_t *__stacksize));
-int	_EXFUN(pthread_attr_setstacksize,
-	(pthread_attr_t *__attr, size_t __stacksize));
-int	_EXFUN(pthread_attr_getstackaddr,
-	(const pthread_attr_t *__attr, void **__stackaddr));
-int	_EXFUN(pthread_attr_setstackaddr,
-	(pthread_attr_t  *__attr, void *__stackaddr));
-int	_EXFUN(pthread_attr_getdetachstate,
-	(const pthread_attr_t *__attr, int *__detachstate));
-int	_EXFUN(pthread_attr_setdetachstate,
-	(pthread_attr_t *__attr, int __detachstate));
-int	_EXFUN(pthread_attr_getguardsize,
-	(const pthread_attr_t *__attr, size_t *__guardsize));
-int	_EXFUN(pthread_attr_setguardsize,
-	(pthread_attr_t *__attr, size_t __guardsize));
+int	pthread_attr_init (pthread_attr_t *__attr);
+int	pthread_attr_destroy (pthread_attr_t *__attr);
+int	pthread_attr_setstack (pthread_attr_t *attr,
+	void *__stackaddr, size_t __stacksize);
+int	pthread_attr_getstack (const pthread_attr_t *attr,
+	void **__stackaddr, size_t *__stacksize);
+int	pthread_attr_getstacksize (const pthread_attr_t *__attr,
+				   size_t *__stacksize);
+int	pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize);
+int	pthread_attr_getstackaddr (const pthread_attr_t *__attr,
+				   void **__stackaddr);
+int	pthread_attr_setstackaddr (pthread_attr_t  *__attr, void *__stackaddr);
+int	pthread_attr_getdetachstate (const pthread_attr_t *__attr,
+				     int *__detachstate);
+int	pthread_attr_setdetachstate (pthread_attr_t *__attr, int __detachstate);
+int	pthread_attr_getguardsize (const pthread_attr_t *__attr,
+				   size_t *__guardsize);
+int	pthread_attr_setguardsize (pthread_attr_t *__attr, size_t __guardsize);
 
 /* POSIX thread APIs beyond the POSIX standard but provided 
  * in GNU/Linux. They may be provided by other OSes for
@@ -233,59 +222,55 @@ int	_EXFUN(pthread_attr_setguardsize,
  */
 #if __GNU_VISIBLE
 #if defined(__rtems__) 
-int	_EXFUN(pthread_attr_setaffinity_np,
-	(pthread_attr_t *__attr, size_t __cpusetsize, 
-	const cpu_set_t *__cpuset));
-int 	_EXFUN(pthread_attr_getaffinity_np,
-	(const pthread_attr_t *__attr, size_t __cpusetsize,
-	cpu_set_t *__cpuset));
-
-int	_EXFUN(pthread_setaffinity_np,
-	(pthread_t __id, size_t __cpusetsize, const cpu_set_t *__cpuset));
-int	_EXFUN(pthread_getaffinity_np,
-	(const pthread_t __id, size_t __cpusetsize, cpu_set_t *__cpuset));
-
-int	_EXFUN(pthread_getattr_np,
-	(pthread_t __id, pthread_attr_t *__attr));
+int	pthread_attr_setaffinity_np (pthread_attr_t *__attr,
+				     size_t __cpusetsize,
+				     const cpu_set_t *__cpuset);
+int 	pthread_attr_getaffinity_np (const pthread_attr_t *__attr,
+				     size_t __cpusetsize, cpu_set_t *__cpuset);
+
+int	pthread_setaffinity_np (pthread_t __id, size_t __cpusetsize,
+				const cpu_set_t *__cpuset);
+int	pthread_getaffinity_np (const pthread_t __id, size_t __cpusetsize,
+				cpu_set_t *__cpuset);
+
+int	pthread_getattr_np (pthread_t __id, pthread_attr_t *__attr);
 #endif /* defined(__rtems__) */
 #endif /* __GNU_VISIBLE */
 
 /* Thread Creation, P1003.1c/Draft 10, p. 144 */
 
-int	_EXFUN(pthread_create,
-	(pthread_t *__pthread, const pthread_attr_t  *__attr,
-	void *(*__start_routine)( void * ), void *__arg));
+int	pthread_create (pthread_t *__pthread, const pthread_attr_t  *__attr,
+			void *(*__start_routine)(void *), void *__arg);
 
 /* Wait for Thread Termination, P1003.1c/Draft 10, p. 147 */
 
-int	_EXFUN(pthread_join, (pthread_t __pthread, void **__value_ptr));
+int	pthread_join (pthread_t __pthread, void **__value_ptr);
 
 /* Detaching a Thread, P1003.1c/Draft 10, p. 149 */
 
-int	_EXFUN(pthread_detach, (pthread_t __pthread));
+int	pthread_detach (pthread_t __pthread);
 
 /* Thread Termination, p1003.1c/Draft 10, p. 150 */
 
-void	_EXFUN(pthread_exit, (void *__value_ptr)) __dead2;
+void	pthread_exit (void *__value_ptr) __dead2;
 
 /* Get Calling Thread's ID, p1003.1c/Draft 10, p. XXX */
 
-pthread_t	_EXFUN(pthread_self, (void));
+pthread_t	pthread_self (void);
 
 /* Compare Thread IDs, p1003.1c/Draft 10, p. 153 */
 
-int	_EXFUN(pthread_equal, (pthread_t __t1, pthread_t __t2));
+int	pthread_equal (pthread_t __t1, pthread_t __t2);
 
 /* Retrieve ID of a Thread's CPU Time Clock */
-int	_EXFUN(pthread_getcpuclockid,
-		(pthread_t thread, clockid_t *clock_id));
+int	pthread_getcpuclockid (pthread_t thread, clockid_t *clock_id);
 
 /* Get/Set Current Thread's Concurrency Level */
-int	_EXFUN(pthread_setconcurrency, (int new_level));
-int	_EXFUN(pthread_getconcurrency, (void));
+int	pthread_setconcurrency (int new_level);
+int	pthread_getconcurrency (void);
 
 #if __BSD_VISIBLE || __GNU_VISIBLE
-void	_EXFUN(pthread_yield, (void));
+void	pthread_yield (void);
 #endif
 
 /* Dynamic Package Initialization */
@@ -298,23 +283,22 @@ void	_EXFUN(pthread_yield, (void));
  
 #define PTHREAD_ONCE_INIT _PTHREAD_ONCE_INIT
  
-int	_EXFUN(pthread_once,
-	(pthread_once_t *__once_control, void (*__init_routine)(void)));
+int	pthread_once (pthread_once_t *__once_control,
+		      void (*__init_routine)(void));
 
 /* Thread-Specific Data Key Create, P1003.1c/Draft 10, p. 163 */
 
-int	_EXFUN(pthread_key_create,
-	(pthread_key_t *__key, void (*__destructor)( void * )));
+int	pthread_key_create (pthread_key_t *__key,
+			    void (*__destructor)(void *));
 
 /* Thread-Specific Data Management, P1003.1c/Draft 10, p. 165 */
 
-int	_EXFUN(pthread_setspecific,
-	(pthread_key_t __key, const void *__value));
-void *	_EXFUN(pthread_getspecific, (pthread_key_t __key));
+int	pthread_setspecific (pthread_key_t __key, const void *__value);
+void *	pthread_getspecific (pthread_key_t __key);
 
 /* Thread-Specific Data Key Deletion, P1003.1c/Draft 10, p. 167 */
 
-int	_EXFUN(pthread_key_delete, (pthread_key_t __key));
+int	pthread_key_delete (pthread_key_t __key);
 
 /* Execution of a Thread, P1003.1c/Draft 10, p. 181 */
 
@@ -326,23 +310,21 @@ int	_EXFUN(pthread_key_delete, (pthread_key_t __key));
 
 #define PTHREAD_CANCELED ((void *) -1)
 
-int	_EXFUN(pthread_cancel, (pthread_t __pthread));
+int	pthread_cancel (pthread_t __pthread);
 
 /* Setting Cancelability State, P1003.1c/Draft 10, p. 183 */
 
-int	_EXFUN(pthread_setcancelstate, (int __state, int *__oldstate));
-int	_EXFUN(pthread_setcanceltype, (int __type, int *__oldtype));
-void 	_EXFUN(pthread_testcancel, (void));
+int	pthread_setcancelstate (int __state, int *__oldstate);
+int	pthread_setcanceltype (int __type, int *__oldtype);
+void 	pthread_testcancel (void);
 
 /* Establishing Cancellation Handlers, P1003.1c/Draft 10, p. 184 */
 
-void	_EXFUN(_pthread_cleanup_push,
-	(struct _pthread_cleanup_context *_context,
-	void (*_routine)(void *), void *_arg));
+void	_pthread_cleanup_push (struct _pthread_cleanup_context *_context,
+			       void (*_routine)(void *), void *_arg);
 
-void	_EXFUN(_pthread_cleanup_pop,
-	(struct _pthread_cleanup_context *_context,
-	int _execute));
+void	_pthread_cleanup_pop (struct _pthread_cleanup_context *_context,
+			      int _execute);
 
 /* It is intentional to open and close the scope in two different macros */
 #define pthread_cleanup_push(_routine, _arg) \
@@ -355,13 +337,11 @@ void	_EXFUN(_pthread_cleanup_pop,
   } while (0)
 
 #if __GNU_VISIBLE
-void	_EXFUN(_pthread_cleanup_push_defer,
-	(struct _pthread_cleanup_context *_context,
-	void (*_routine)(void *), void *_arg));
+void	_pthread_cleanup_push_defer (struct _pthread_cleanup_context *_context,
+				     void (*_routine)(void *), void *_arg);
 
-void	_EXFUN(_pthread_cleanup_pop_restore,
-	(struct _pthread_cleanup_context *_context,
-	int _execute));
+void	_pthread_cleanup_pop_restore (struct _pthread_cleanup_context *_context,
+				      int _execute);
 
 /* It is intentional to open and close the scope in two different macros */
 #define pthread_cleanup_push_defer_np(_routine, _arg) \
@@ -378,8 +358,7 @@ void	_EXFUN(_pthread_cleanup_pop_restore,
  
 /* Accessing a Thread CPU-time Clock, P1003.4b/D8, p. 58 */
  
-int	_EXFUN(pthread_getcpuclockid,
-	(pthread_t __pthread_id, clockid_t *__clock_id));
+int	pthread_getcpuclockid (pthread_t __pthread_id, clockid_t *__clock_id);
  
 #endif /* defined(_POSIX_THREAD_CPUTIME) */
 
@@ -388,31 +367,30 @@ int	_EXFUN(pthread_getcpuclockid,
 
 #if defined(_POSIX_BARRIERS)
 
-int	_EXFUN(pthread_barrierattr_init, (pthread_barrierattr_t *__attr));
-int	_EXFUN(pthread_barrierattr_destroy, (pthread_barrierattr_t *__attr));
-int	_EXFUN(pthread_barrierattr_getpshared,
-	(const pthread_barrierattr_t *__attr, int *__pshared));
-int	_EXFUN(pthread_barrierattr_setpshared,
-	(pthread_barrierattr_t *__attr, int __pshared));
+int	pthread_barrierattr_init (pthread_barrierattr_t *__attr);
+int	pthread_barrierattr_destroy (pthread_barrierattr_t *__attr);
+int	pthread_barrierattr_getpshared (const pthread_barrierattr_t *__attr,
+					int *__pshared);
+int	pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
+					int __pshared);
 
 #define PTHREAD_BARRIER_SERIAL_THREAD -1
 
-int	_EXFUN(pthread_barrier_init,
-	(pthread_barrier_t *__barrier,
-	const pthread_barrierattr_t *__attr, unsigned __count));
-int	_EXFUN(pthread_barrier_destroy, (pthread_barrier_t *__barrier));
-int	_EXFUN(pthread_barrier_wait,(pthread_barrier_t *__barrier));
+int	pthread_barrier_init (pthread_barrier_t *__barrier,
+			      const pthread_barrierattr_t *__attr,
+			      unsigned __count);
+int	pthread_barrier_destroy (pthread_barrier_t *__barrier);
+int	pthread_barrier_wait (pthread_barrier_t *__barrier);
 
 #endif /* defined(_POSIX_BARRIERS) */
 
 #if defined(_POSIX_SPIN_LOCKS)
 
-int	_EXFUN(pthread_spin_init,
-	(pthread_spinlock_t *__spinlock, int __pshared));
-int	_EXFUN(pthread_spin_destroy, (pthread_spinlock_t *__spinlock));
-int	_EXFUN(pthread_spin_lock, (pthread_spinlock_t *__spinlock));
-int	_EXFUN(pthread_spin_trylock, (pthread_spinlock_t *__spinlock));
-int	_EXFUN(pthread_spin_unlock, (pthread_spinlock_t *__spinlock));
+int	pthread_spin_init (pthread_spinlock_t *__spinlock, int __pshared);
+int	pthread_spin_destroy (pthread_spinlock_t *__spinlock);
+int	pthread_spin_lock (pthread_spinlock_t *__spinlock);
+int	pthread_spin_trylock (pthread_spinlock_t *__spinlock);
+int	pthread_spin_unlock (pthread_spinlock_t *__spinlock);
 
 #endif /* defined(_POSIX_SPIN_LOCKS) */
 
@@ -425,25 +403,25 @@ int	_EXFUN(pthread_spin_unlock, (pthread_spinlock_t *__spinlock));
 
 #define PTHREAD_RWLOCK_INITIALIZER _PTHREAD_RWLOCK_INITIALIZER
 
-int	_EXFUN(pthread_rwlockattr_init, (pthread_rwlockattr_t *__attr));
-int	_EXFUN(pthread_rwlockattr_destroy, (pthread_rwlockattr_t *__attr));
-int	_EXFUN(pthread_rwlockattr_getpshared,
-	(const pthread_rwlockattr_t *__attr, int *__pshared));
-int	_EXFUN(pthread_rwlockattr_setpshared,
-	(pthread_rwlockattr_t *__attr, int __pshared));
-
-int	_EXFUN(pthread_rwlock_init,
-	(pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *__attr));
-int	_EXFUN(pthread_rwlock_destroy, (pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_rdlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_tryrdlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_timedrdlock,
-        (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
-int	_EXFUN(pthread_rwlock_unlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_wrlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_trywrlock,(pthread_rwlock_t *__rwlock));
-int	_EXFUN(pthread_rwlock_timedwrlock,
-        (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
+int	pthread_rwlockattr_init (pthread_rwlockattr_t *__attr);
+int	pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr);
+int	pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *__attr,
+				       int *__pshared);
+int	pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
+				       int __pshared);
+
+int	pthread_rwlock_init (pthread_rwlock_t *__rwlock,
+			     const pthread_rwlockattr_t *__attr);
+int	pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_timedrdlock (pthread_rwlock_t *__rwlock,
+				    const struct timespec *__abstime);
+int	pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
+int	pthread_rwlock_timedwrlock (pthread_rwlock_t *__rwlock,
+				    const struct timespec *__abstime);
 
 #endif /* defined(_POSIX_READER_WRITER_LOCKS) */
 
diff --git a/newlib/libc/include/rpc/xdr.h b/newlib/libc/include/rpc/xdr.h
index bda8e99..139e0c7 100644
--- a/newlib/libc/include/rpc/xdr.h
+++ b/newlib/libc/include/rpc/xdr.h
@@ -292,51 +292,51 @@ struct xdr_discrim
 /*
  * These are the "generic" xdr routines.
  */
-extern bool_t _EXFUN (xdr_void, (void));
-extern bool_t _EXFUN (xdr_short, (XDR *, short *));
-extern bool_t _EXFUN (xdr_u_short, (XDR *, u_short *));
-extern bool_t _EXFUN (xdr_int, (XDR *, int *));
-extern bool_t _EXFUN (xdr_u_int, (XDR *, u_int *));
-extern bool_t _EXFUN (xdr_long, (XDR *, long *));
-extern bool_t _EXFUN (xdr_u_long, (XDR *, u_long *));
-extern bool_t _EXFUN (xdr_int8_t, (XDR *, int8_t *));
-extern bool_t _EXFUN (xdr_uint8_t, (XDR *, uint8_t *));
-extern bool_t _EXFUN (xdr_u_int8_t, (XDR *, u_int8_t *));
-extern bool_t _EXFUN (xdr_int16_t, (XDR *, int16_t *));
-extern bool_t _EXFUN (xdr_uint16_t, (XDR *, uint16_t *));
-extern bool_t _EXFUN (xdr_u_int16_t, (XDR *, u_int16_t *));
-extern bool_t _EXFUN (xdr_int32_t, (XDR *, int32_t *));
-extern bool_t _EXFUN (xdr_uint32_t, (XDR *, uint32_t *));
-extern bool_t _EXFUN (xdr_u_int32_t, (XDR *, u_int32_t *));
+extern bool_t xdr_void (void);
+extern bool_t xdr_short (XDR *, short *);
+extern bool_t xdr_u_short (XDR *, u_short *);
+extern bool_t xdr_int (XDR *, int *);
+extern bool_t xdr_u_int (XDR *, u_int *);
+extern bool_t xdr_long (XDR *, long *);
+extern bool_t xdr_u_long (XDR *, u_long *);
+extern bool_t xdr_int8_t (XDR *, int8_t *);
+extern bool_t xdr_uint8_t (XDR *, uint8_t *);
+extern bool_t xdr_u_int8_t (XDR *, u_int8_t *);
+extern bool_t xdr_int16_t (XDR *, int16_t *);
+extern bool_t xdr_uint16_t (XDR *, uint16_t *);
+extern bool_t xdr_u_int16_t (XDR *, u_int16_t *);
+extern bool_t xdr_int32_t (XDR *, int32_t *);
+extern bool_t xdr_uint32_t (XDR *, uint32_t *);
+extern bool_t xdr_u_int32_t (XDR *, u_int32_t *);
 #if defined(___int64_t_defined)
-extern bool_t _EXFUN (xdr_int64_t, (XDR *, int64_t *));
-extern bool_t _EXFUN (xdr_uint64_t, (XDR *, uint64_t *));
-extern bool_t _EXFUN (xdr_u_int64_t, (XDR *, u_int64_t *));
+extern bool_t xdr_int64_t (XDR *, int64_t *);
+extern bool_t xdr_uint64_t (XDR *, uint64_t *);
+extern bool_t xdr_u_int64_t (XDR *, u_int64_t *);
 #endif /* ___int64_t_defined */
-extern bool_t _EXFUN (xdr_bool, (XDR *, bool_t *));
-extern bool_t _EXFUN (xdr_enum, (XDR *, enum_t *));
-extern bool_t _EXFUN (xdr_array, (XDR *, char **, u_int *, u_int, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_bytes, (XDR *, char **, u_int *, u_int));
-extern bool_t _EXFUN (xdr_opaque, (XDR *, char *, u_int));
-extern bool_t _EXFUN (xdr_string, (XDR *, char **, u_int));
-extern bool_t _EXFUN (xdr_union, (XDR *, enum_t *, char *,
-                                  const struct xdr_discrim *, xdrproc_t));
-extern bool_t _EXFUN (xdr_char, (XDR *, char *));
-extern bool_t _EXFUN (xdr_u_char, (XDR *, u_char *));
-extern bool_t _EXFUN (xdr_vector, (XDR *, char *, u_int, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_float, (XDR *, float *));
-extern bool_t _EXFUN (xdr_double, (XDR *, double *));
-/* extern bool_t _EXFUN (xdr_quadruple, (XDR *, long double *)); */
-extern bool_t _EXFUN (xdr_reference, (XDR *, char **, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_pointer, (XDR *, char **, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_wrapstring, (XDR *, char **));
+extern bool_t xdr_bool (XDR *, bool_t *);
+extern bool_t xdr_enum (XDR *, enum_t *);
+extern bool_t xdr_array (XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_bytes (XDR *, char **, u_int *, u_int);
+extern bool_t xdr_opaque (XDR *, char *, u_int);
+extern bool_t xdr_string (XDR *, char **, u_int);
+extern bool_t xdr_union (XDR *, enum_t *, char *,
+                                  const struct xdr_discrim *, xdrproc_t);
+extern bool_t xdr_char (XDR *, char *);
+extern bool_t xdr_u_char (XDR *, u_char *);
+extern bool_t xdr_vector (XDR *, char *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_float (XDR *, float *);
+extern bool_t xdr_double (XDR *, double *);
+/* extern bool_t xdr_quadruple (XDR *, long double *); */
+extern bool_t xdr_reference (XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_pointer (XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_wrapstring (XDR *, char **);
 #if defined(___int64_t_defined)
-extern bool_t _EXFUN (xdr_hyper, (XDR *, quad_t *));
-extern bool_t _EXFUN (xdr_u_hyper, (XDR *, u_quad_t *));
-extern bool_t _EXFUN (xdr_longlong_t, (XDR *, quad_t *));
-extern bool_t _EXFUN (xdr_u_longlong_t, (XDR *, u_quad_t *));
+extern bool_t xdr_hyper (XDR *, quad_t *);
+extern bool_t xdr_u_hyper (XDR *, u_quad_t *);
+extern bool_t xdr_longlong_t (XDR *, quad_t *);
+extern bool_t xdr_u_longlong_t (XDR *, u_quad_t *);
 #endif /* ___int64_t_defined */
-extern u_long _EXFUN (xdr_sizeof, (xdrproc_t, void *));
+extern u_long xdr_sizeof (xdrproc_t, void *);
 
 /*
  * Common opaque bytes objects used by many rpc protocols;
@@ -349,7 +349,7 @@ struct netobj
   char *n_bytes;
 };
 typedef struct netobj netobj;
-extern bool_t _EXFUN (xdr_netobj, (XDR *, struct netobj *));
+extern bool_t xdr_netobj (XDR *, struct netobj *);
 
 /*
  * These are the public routines for the various implementations of
@@ -357,30 +357,30 @@ extern bool_t _EXFUN (xdr_netobj, (XDR *, struct netobj *));
  */
 
 /* XDR using memory buffers */
-extern void _EXFUN (xdrmem_create, (XDR *, char *, u_int, enum xdr_op));
+extern void xdrmem_create (XDR *, char *, u_int, enum xdr_op);
 
 /* XDR using stdio library */
 #if defined(_STDIO_H_)
-extern void _EXFUN (xdrstdio_create, (XDR *, FILE *, enum xdr_op));
+extern void xdrstdio_create (XDR *, FILE *, enum xdr_op);
 #endif
 
 /* XDR pseudo records for tcp */
-extern void _EXFUN (xdrrec_create, (XDR *, u_int, u_int, void *,
+extern void xdrrec_create (XDR *, u_int, u_int, void *,
                                     int (*) (void *, void *, int),
-                                    int (*) (void *, void *, int)));
+                                    int (*) (void *, void *, int));
 
 /* make end of xdr record */
-extern bool_t _EXFUN (xdrrec_endofrecord, (XDR *, bool_t));
+extern bool_t xdrrec_endofrecord (XDR *, bool_t);
 
 /* move to beginning of next record */
-extern bool_t _EXFUN (xdrrec_skiprecord, (XDR *));
+extern bool_t xdrrec_skiprecord (XDR *);
 
 /* true if no more input */
-extern bool_t _EXFUN (xdrrec_eof, (XDR *));
-extern u_int _EXFUN (xdrrec_readbytes, (XDR *, caddr_t, u_int));
+extern bool_t xdrrec_eof (XDR *);
+extern u_int xdrrec_readbytes (XDR *, caddr_t, u_int);
 
 /* free memory buffers for xdr */
-extern void _EXFUN (xdr_free, (xdrproc_t, void *));
+extern void xdr_free (xdrproc_t, void *);
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/include/setjmp.h b/newlib/libc/include/setjmp.h
index 521eac5..a2830b2 100644
--- a/newlib/libc/include/setjmp.h
+++ b/newlib/libc/include/setjmp.h
@@ -12,12 +12,12 @@
 _BEGIN_STD_C
 
 #ifdef __GNUC__
-void	_EXFUN(longjmp,(jmp_buf __jmpb, int __retval))
+void	longjmp (jmp_buf __jmpb, int __retval)
 			__attribute__ ((__noreturn__));
 #else
-void	_EXFUN(longjmp,(jmp_buf __jmpb, int __retval));
+void	longjmp (jmp_buf __jmpb, int __retval);
 #endif
-int	_EXFUN(setjmp,(jmp_buf __jmpb));
+int	setjmp (jmp_buf __jmpb);
 
 _END_STD_C
 
diff --git a/newlib/libc/include/signal.h b/newlib/libc/include/signal.h
index 0324ae7..23a9863 100644
--- a/newlib/libc/include/signal.h
+++ b/newlib/libc/include/signal.h
@@ -21,13 +21,13 @@ typedef _sig_func_ptr sighandler_t;	/* glibc naming */
 
 struct _reent;
 
-_sig_func_ptr _EXFUN(_signal_r, (struct _reent *, int, _sig_func_ptr));
-int	_EXFUN(_raise_r, (struct _reent *, int));
+_sig_func_ptr _signal_r (struct _reent *, int, _sig_func_ptr);
+int	_raise_r (struct _reent *, int);
 
 #ifndef _REENT_ONLY
-_sig_func_ptr _EXFUN(signal, (int, _sig_func_ptr));
-int	_EXFUN(raise, (int));
-void	_EXFUN(psignal, (int, const char *));
+_sig_func_ptr signal (int, _sig_func_ptr);
+int	raise (int);
+void	psignal (int, const char *);
 #endif
 
 _END_STD_C
diff --git a/newlib/libc/include/spawn.h b/newlib/libc/include/spawn.h
index 5a6692f..d172177 100644
--- a/newlib/libc/include/spawn.h
+++ b/newlib/libc/include/spawn.h
@@ -53,67 +53,52 @@ _BEGIN_STD_C
  * XXX both arrays should be __restrict, but this does not work when GCC
  * is invoked with -std=c99.
  */
-int _EXFUN(posix_spawn, (pid_t *  __restrict, const char * __restrict,
+int posix_spawn (pid_t *  __restrict, const char * __restrict,
 	const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
-	char * const [], char * const [])
-);
-int _EXFUN(posix_spawnp, (pid_t * __restrict, const char * __restrict,
+	char * const [], char * const []);
+int posix_spawnp (pid_t * __restrict, const char * __restrict,
 	const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
-	char * const [], char * const [])
-);
+	char * const [], char * const []);
 
 /*
  * File descriptor actions
  */
-int _EXFUN(posix_spawn_file_actions_init, (posix_spawn_file_actions_t *));
-int _EXFUN(posix_spawn_file_actions_destroy, (posix_spawn_file_actions_t *));
+int posix_spawn_file_actions_init (posix_spawn_file_actions_t *);
+int posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *);
 
-int _EXFUN(posix_spawn_file_actions_addopen,
-	(posix_spawn_file_actions_t * __restrict, int, const char * __restrict, int, mode_t)
-);
-int _EXFUN(posix_spawn_file_actions_adddup2,
-	(posix_spawn_file_actions_t *, int, int)
-);
-int _EXFUN(posix_spawn_file_actions_addclose,
-	(posix_spawn_file_actions_t *, int)
-);
+int posix_spawn_file_actions_addopen (posix_spawn_file_actions_t * __restrict,
+				      int, const char * __restrict, int, mode_t);
+int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *, int, int);
+int posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *, int);
 
 /*
  * Spawn attributes
  */
-int _EXFUN(posix_spawnattr_init, (posix_spawnattr_t *));
-int _EXFUN(posix_spawnattr_destroy, (posix_spawnattr_t *));
+int posix_spawnattr_init (posix_spawnattr_t *);
+int posix_spawnattr_destroy (posix_spawnattr_t *);
 
-int _EXFUN(posix_spawnattr_getflags,
-	(const posix_spawnattr_t * __restrict, short * __restrict)
-);
-int _EXFUN(posix_spawnattr_getpgroup,
-	(const posix_spawnattr_t * __restrict, pid_t * __restrict));
-int _EXFUN(posix_spawnattr_getschedparam,
-	(const posix_spawnattr_t * __restrict, struct sched_param * __restrict)
-);
-int _EXFUN(posix_spawnattr_getschedpolicy,
-	(const posix_spawnattr_t * __restrict, int * __restrict)
-);
-int _EXFUN(posix_spawnattr_getsigdefault,
-	(const posix_spawnattr_t * __restrict, sigset_t * __restrict)
-);
-int _EXFUN(posix_spawnattr_getsigmask,
-	(const posix_spawnattr_t * __restrict, sigset_t * __restrict)
-);
+int posix_spawnattr_getflags (const posix_spawnattr_t * __restrict,
+			      short * __restrict);
+int posix_spawnattr_getpgroup (const posix_spawnattr_t * __restrict,
+			       pid_t * __restrict);
+int posix_spawnattr_getschedparam (const posix_spawnattr_t * __restrict,
+				   struct sched_param * __restrict);
+int posix_spawnattr_getschedpolicy (const posix_spawnattr_t * __restrict,
+				    int * __restrict);
+int posix_spawnattr_getsigdefault (const posix_spawnattr_t * __restrict,
+				   sigset_t * __restrict);
+int posix_spawnattr_getsigmask (const posix_spawnattr_t * __restrict,
+				sigset_t * __restrict);
 
-int _EXFUN(posix_spawnattr_setflags, (posix_spawnattr_t *, short));
-int _EXFUN(posix_spawnattr_setpgroup, (posix_spawnattr_t *, pid_t));
-int _EXFUN(posix_spawnattr_setschedparam,
-	(posix_spawnattr_t * __restrict, const struct sched_param * __restrict)
-);
-int _EXFUN(posix_spawnattr_setschedpolicy, (posix_spawnattr_t *, int));
-int _EXFUN(posix_spawnattr_setsigdefault,
-	(posix_spawnattr_t * __restrict, const sigset_t * __restrict)
-);
-int _EXFUN(posix_spawnattr_setsigmask,
-	(posix_spawnattr_t * __restrict, const sigset_t * __restrict)
-);
+int posix_spawnattr_setflags (posix_spawnattr_t *, short);
+int posix_spawnattr_setpgroup (posix_spawnattr_t *, pid_t);
+int posix_spawnattr_setschedparam (posix_spawnattr_t * __restrict,
+				   const struct sched_param * __restrict);
+int posix_spawnattr_setschedpolicy (posix_spawnattr_t *, int);
+int posix_spawnattr_setsigdefault (posix_spawnattr_t * __restrict,
+				   const sigset_t * __restrict);
+int posix_spawnattr_setsigmask (posix_spawnattr_t * __restrict,
+				const sigset_t * __restrict);
 _END_STD_C
 
 #endif /* !_SPAWN_H_ */
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 1271450..cbc0fa9 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -178,155 +178,155 @@ typedef _fpos64_t fpos64_t;
 #endif
 
 #if __POSIX_VISIBLE
-char *	_EXFUN(ctermid, (char *));
+char *	ctermid (char *);
 #endif
 #if __XSI_VISIBLE && __XSI_VISIBLE < 600
-char *	_EXFUN(cuserid, (char *));
+char *	cuserid (char *);
 #endif
-FILE *	_EXFUN(tmpfile, (void));
-char *	_EXFUN(tmpnam, (char *));
+FILE *	tmpfile (void);
+char *	tmpnam (char *);
 #if __BSD_VISIBLE || __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-char *	_EXFUN(tempnam, (const char *, const char *));
-#endif
-int	_EXFUN(fclose, (FILE *));
-int	_EXFUN(fflush, (FILE *));
-FILE *	_EXFUN(freopen, (const char *__restrict, const char *__restrict, FILE *__restrict));
-void	_EXFUN(setbuf, (FILE *__restrict, char *__restrict));
-int	_EXFUN(setvbuf, (FILE *__restrict, char *__restrict, int, size_t));
-int	_EXFUN(fprintf, (FILE *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(fscanf, (FILE *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(printf, (const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
-int	_EXFUN(scanf, (const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 2))));
-int	_EXFUN(sscanf, (const char *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(vfprintf, (FILE *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vprintf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
-int	_EXFUN(vsprintf, (char *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(fgetc, (FILE *));
-char *  _EXFUN(fgets, (char *__restrict, int, FILE *__restrict));
-int	_EXFUN(fputc, (int, FILE *));
-int	_EXFUN(fputs, (const char *__restrict, FILE *__restrict));
-int	_EXFUN(getc, (FILE *));
-int	_EXFUN(getchar, (void));
-char *  _EXFUN(gets, (char *));
-int	_EXFUN(putc, (int, FILE *));
-int	_EXFUN(putchar, (int));
-int	_EXFUN(puts, (const char *));
-int	_EXFUN(ungetc, (int, FILE *));
-size_t	_EXFUN(fread, (void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t	_EXFUN(fwrite, (const void *__restrict , size_t _size, size_t _n, FILE *));
+char *	tempnam (const char *, const char *);
+#endif
+int	fclose (FILE *);
+int	fflush (FILE *);
+FILE *	freopen (const char *__restrict, const char *__restrict, FILE *__restrict);
+void	setbuf (FILE *__restrict, char *__restrict);
+int	setvbuf (FILE *__restrict, char *__restrict, int, size_t);
+int	fprintf (FILE *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	fscanf (FILE *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	printf (const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 1, 2)));
+int	scanf (const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 1, 2)));
+int	sscanf (const char *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	vfprintf (FILE *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	vprintf (const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 1, 0)));
+int	vsprintf (char *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	fgetc (FILE *);
+char *  fgets (char *__restrict, int, FILE *__restrict);
+int	fputc (int, FILE *);
+int	fputs (const char *__restrict, FILE *__restrict);
+int	getc (FILE *);
+int	getchar (void);
+char *  gets (char *);
+int	putc (int, FILE *);
+int	putchar (int);
+int	puts (const char *);
+int	ungetc (int, FILE *);
+size_t	fread (void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t	fwrite (const void *__restrict , size_t _size, size_t _n, FILE *);
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(fgetpos, (FILE *, _fpos_t *));
+int	fgetpos (FILE *, _fpos_t *);
 #else
-int	_EXFUN(fgetpos, (FILE *__restrict, fpos_t *__restrict));
+int	fgetpos (FILE *__restrict, fpos_t *__restrict);
 #endif
-int	_EXFUN(fseek, (FILE *, long, int));
+int	fseek (FILE *, long, int);
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(fsetpos, (FILE *, const _fpos_t *));
+int	fsetpos (FILE *, const _fpos_t *);
 #else
-int	_EXFUN(fsetpos, (FILE *, const fpos_t *));
-#endif
-long	_EXFUN(ftell, ( FILE *));
-void	_EXFUN(rewind, (FILE *));
-void	_EXFUN(clearerr, (FILE *));
-int	_EXFUN(feof, (FILE *));
-int	_EXFUN(ferror, (FILE *));
-void    _EXFUN(perror, (const char *));
+int	fsetpos (FILE *, const fpos_t *);
+#endif
+long	ftell ( FILE *);
+void	rewind (FILE *);
+void	clearerr (FILE *);
+int	feof (FILE *);
+int	ferror (FILE *);
+void    perror (const char *);
 #ifndef _REENT_ONLY
-FILE *	_EXFUN(fopen, (const char *__restrict _name, const char *__restrict _type));
-int	_EXFUN(sprintf, (char *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(remove, (const char *));
-int	_EXFUN(rename, (const char *, const char *));
+FILE *	fopen (const char *__restrict _name, const char *__restrict _type);
+int	sprintf (char *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	remove (const char *);
+int	rename (const char *, const char *);
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(_rename, (const char *, const char *));
+int	_rename (const char *, const char *);
 #endif
 #endif
 #if __LARGEFILE_VISIBLE || __POSIX_VISIBLE >= 200112
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(fseeko, (FILE *, _off_t, int));
-_off_t	_EXFUN(ftello, ( FILE *));
+int	fseeko (FILE *, _off_t, int);
+_off_t	ftello (FILE *);
 #else
-int	_EXFUN(fseeko, (FILE *, off_t, int));
-off_t	_EXFUN(ftello, ( FILE *));
+int	fseeko (FILE *, off_t, int);
+off_t	ftello (FILE *);
 #endif
 #endif
 #if __GNU_VISIBLE
-int	_EXFUN(fcloseall, (void));
+int	fcloseall (void);
 #endif
 #ifndef _REENT_ONLY
 #if __ISO_C_VISIBLE >= 1999
-int	_EXFUN(snprintf, (char *__restrict, size_t, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(vsnprintf, (char *__restrict, size_t, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(vfscanf, (FILE *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(vscanf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 0))));
-int	_EXFUN(vsscanf, (const char *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
+int	snprintf (char *__restrict, size_t, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	vsnprintf (char *__restrict, size_t, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	vfscanf (FILE *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	vscanf (const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 1, 0)));
+int	vsscanf (const char *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
 #endif
 #if __GNU_VISIBLE
-int	_EXFUN(asprintf, (char **__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(vasprintf, (char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+int	asprintf (char **__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	vasprintf (char **, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
 #endif
 #if __MISC_VISIBLE /* Newlib-specific */
-int	_EXFUN(asiprintf, (char **, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-char *	_EXFUN(asniprintf, (char *, size_t *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-char *	_EXFUN(asnprintf, (char *__restrict, size_t *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
+int	asiprintf (char **, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+char *	asniprintf (char *, size_t *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+char *	asnprintf (char *__restrict, size_t *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
 #ifndef diprintf
-int	_EXFUN(diprintf, (int, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-#endif
-int	_EXFUN(fiprintf, (FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(fiscanf, (FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(iprintf, (const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
-int	_EXFUN(iscanf, (const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 2))));
-int	_EXFUN(siprintf, (char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(siscanf, (const char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(sniprintf, (char *, size_t, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(vasiprintf, (char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-char *	_EXFUN(vasniprintf, (char *, size_t *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-char *	_EXFUN(vasnprintf, (char *, size_t *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(vdiprintf, (int, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(viprintf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
-int	_EXFUN(viscanf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 0))));
-int	_EXFUN(vsiprintf, (char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vsiscanf, (const char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+int	diprintf (int, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+#endif
+int	fiprintf (FILE *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	fiscanf (FILE *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	iprintf (const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 1, 2)));
+int	iscanf (const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 1, 2)));
+int	siprintf (char *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	siscanf (const char *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	sniprintf (char *, size_t, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	vasiprintf (char **, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+char *	vasniprintf (char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+char *	vasnprintf (char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	vdiprintf (int, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	vfiprintf (FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	vfiscanf (FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	viprintf (const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 1, 0)));
+int	viscanf (const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 1, 0)));
+int	vsiprintf (char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	vsiscanf (const char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	vsniprintf (char *, size_t, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
 #endif /* __MISC_VISIBLE */
 #endif /* !_REENT_ONLY */
 
@@ -336,32 +336,32 @@ int	_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
 
 #if __POSIX_VISIBLE
 #ifndef _REENT_ONLY
-FILE *	_EXFUN(fdopen, (int, const char *));
+FILE *	fdopen (int, const char *);
 #endif
-int	_EXFUN(fileno, (FILE *));
+int	fileno (FILE *);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE >= 199209
-int	_EXFUN(pclose, (FILE *));
-FILE *  _EXFUN(popen, (const char *, const char *));
+int	pclose (FILE *);
+FILE *  popen (const char *, const char *);
 #endif
 
 #if __BSD_VISIBLE
-void    _EXFUN(setbuffer, (FILE *, char *, int));
-int	_EXFUN(setlinebuf, (FILE *));
+void    setbuffer (FILE *, char *, int);
+int	setlinebuf (FILE *);
 #endif
 
 #if __MISC_VISIBLE || (__XSI_VISIBLE && __POSIX_VISIBLE < 200112)
-int	_EXFUN(getw, (FILE *));
-int	_EXFUN(putw, (int, FILE *));
+int	getw (FILE *);
+int	putw (int, FILE *);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE
-int	_EXFUN(getc_unlocked, (FILE *));
-int	_EXFUN(getchar_unlocked, (void));
-void	_EXFUN(flockfile, (FILE *));
-int	_EXFUN(ftrylockfile, (FILE *));
-void	_EXFUN(funlockfile, (FILE *));
-int	_EXFUN(putc_unlocked, (int, FILE *));
-int	_EXFUN(putchar_unlocked, (int));
+int	getc_unlocked (FILE *);
+int	getchar_unlocked (void);
+void	flockfile (FILE *);
+int	ftrylockfile (FILE *);
+void	funlockfile (FILE *);
+int	putc_unlocked (int, FILE *);
+int	putchar_unlocked (int);
 #endif
 
 /*
@@ -371,21 +371,21 @@ int	_EXFUN(putchar_unlocked, (int));
 #if __POSIX_VISIBLE >= 200809
 # ifndef _REENT_ONLY
 #  ifndef dprintf
-int	_EXFUN(dprintf, (int, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+int	dprintf (int, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
 #  endif
-FILE *	_EXFUN(fmemopen, (void *__restrict, size_t, const char *__restrict));
+FILE *	fmemopen (void *__restrict, size_t, const char *__restrict);
 /* getdelim - see __getdelim for now */
 /* getline - see __getline for now */
-FILE *	_EXFUN(open_memstream, (char **, size_t *));
-int	_EXFUN(vdprintf, (int, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+FILE *	open_memstream (char **, size_t *);
+int	vdprintf (int, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
 # endif
 #endif
 #if __ATFILE_VISIBLE
-int	_EXFUN(renameat, (int, const char *, int, const char *));
+int	renameat (int, const char *, int, const char *);
 # ifdef __CYGWIN__
-int	_EXFUN(renameat2, (int, const char *, int, const char *, unsigned int));
+int	renameat2 (int, const char *, int, const char *, unsigned int);
 # endif
 #endif
 
@@ -393,180 +393,180 @@ int	_EXFUN(renameat2, (int, const char *, int, const char *, unsigned int));
  * Recursive versions of the above.
  */
 
-int	_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-char *	_EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-char *	_EXFUN(_asnprintf_r, (struct _reent *, char *__restrict, size_t *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int	_EXFUN(_asprintf_r, (struct _reent *, char **__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_dprintf_r, (struct _reent *, int, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_fclose_r, (struct _reent *, FILE *));
-int	_EXFUN(_fcloseall_r, (struct _reent *));
-FILE *	_EXFUN(_fdopen_r, (struct _reent *, int, const char *));
-int	_EXFUN(_fflush_r, (struct _reent *, FILE *));
-int	_EXFUN(_fgetc_r, (struct _reent *, FILE *));
-int	_EXFUN(_fgetc_unlocked_r, (struct _reent *, FILE *));
-char *  _EXFUN(_fgets_r, (struct _reent *, char *__restrict, int, FILE *__restrict));
-char *  _EXFUN(_fgets_unlocked_r, (struct _reent *, char *__restrict, int, FILE *__restrict));
+int	_asiprintf_r (struct _reent *, char **, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+char *	_asniprintf_r (struct _reent *, char *, size_t *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+char *	_asnprintf_r (struct _reent *, char *__restrict, size_t *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int	_asprintf_r (struct _reent *, char **__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_diprintf_r (struct _reent *, int, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_dprintf_r (struct _reent *, int, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_fclose_r (struct _reent *, FILE *);
+int	_fcloseall_r (struct _reent *);
+FILE *	_fdopen_r (struct _reent *, int, const char *);
+int	_fflush_r (struct _reent *, FILE *);
+int	_fgetc_r (struct _reent *, FILE *);
+int	_fgetc_unlocked_r (struct _reent *, FILE *);
+char *  _fgets_r (struct _reent *, char *__restrict, int, FILE *__restrict);
+char *  _fgets_unlocked_r (struct _reent *, char *__restrict, int, FILE *__restrict);
 #ifdef _COMPILING_NEWLIB
-int	_EXFUN(_fgetpos_r, (struct _reent *, FILE *__restrict, _fpos_t *__restrict));
-int	_EXFUN(_fsetpos_r, (struct _reent *, FILE *, const _fpos_t *));
+int	_fgetpos_r (struct _reent *, FILE *__restrict, _fpos_t *__restrict);
+int	_fsetpos_r (struct _reent *, FILE *, const _fpos_t *);
 #else
-int	_EXFUN(_fgetpos_r, (struct _reent *, FILE *, fpos_t *));
-int	_EXFUN(_fsetpos_r, (struct _reent *, FILE *, const fpos_t *));
-#endif
-int	_EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_fiscanf_r, (struct _reent *, FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-FILE *	_EXFUN(_fmemopen_r, (struct _reent *, void *__restrict, size_t, const char *__restrict));
-FILE *	_EXFUN(_fopen_r, (struct _reent *, const char *__restrict, const char *__restrict));
-FILE *	_EXFUN(_freopen_r, (struct _reent *, const char *__restrict, const char *__restrict, FILE *__restrict));
-int	_EXFUN(_fprintf_r, (struct _reent *, FILE *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_fpurge_r, (struct _reent *, FILE *));
-int	_EXFUN(_fputc_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_fputc_unlocked_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_fputs_r, (struct _reent *, const char *__restrict, FILE *__restrict));
-int	_EXFUN(_fputs_unlocked_r, (struct _reent *, const char *__restrict, FILE *__restrict));
-size_t	_EXFUN(_fread_r, (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t	_EXFUN(_fread_unlocked_r, (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-int	_EXFUN(_fscanf_r, (struct _reent *, FILE *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-int	_EXFUN(_fseek_r, (struct _reent *, FILE *, long, int));
-int	_EXFUN(_fseeko_r,(struct _reent *, FILE *, _off_t, int));
-long	_EXFUN(_ftell_r, (struct _reent *, FILE *));
-_off_t	_EXFUN(_ftello_r,(struct _reent *, FILE *));
-void	_EXFUN(_rewind_r, (struct _reent *, FILE *));
-size_t	_EXFUN(_fwrite_r, (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t	_EXFUN(_fwrite_unlocked_r, (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-int	_EXFUN(_getc_r, (struct _reent *, FILE *));
-int	_EXFUN(_getc_unlocked_r, (struct _reent *, FILE *));
-int	_EXFUN(_getchar_r, (struct _reent *));
-int	_EXFUN(_getchar_unlocked_r, (struct _reent *));
-char *	_EXFUN(_gets_r, (struct _reent *, char *));
-int	_EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(_iscanf_r, (struct _reent *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-FILE *	_EXFUN(_open_memstream_r, (struct _reent *, char **, size_t *));
-void	_EXFUN(_perror_r, (struct _reent *, const char *));
-int	_EXFUN(_printf_r, (struct _reent *, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(_putc_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_putc_unlocked_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_putchar_unlocked_r, (struct _reent *, int));
-int	_EXFUN(_putchar_r, (struct _reent *, int));
-int	_EXFUN(_puts_r, (struct _reent *, const char *));
-int	_EXFUN(_remove_r, (struct _reent *, const char *));
-int	_EXFUN(_rename_r, (struct _reent *,
-			   const char *_old, const char *_new));
-int	_EXFUN(_scanf_r, (struct _reent *, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_siscanf_r, (struct _reent *, const char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-int	_EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int	_EXFUN(_snprintf_r, (struct _reent *, char *__restrict, size_t, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int	_EXFUN(_sprintf_r, (struct _reent *, char *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_sscanf_r, (struct _reent *, const char *__restrict, const char *__restrict, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-char *	_EXFUN(_tempnam_r, (struct _reent *, const char *, const char *));
-FILE *	_EXFUN(_tmpfile_r, (struct _reent *));
-char *	_EXFUN(_tmpnam_r, (struct _reent *, char *));
-int	_EXFUN(_ungetc_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-char *	_EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-char *	_EXFUN(_vasnprintf_r, (struct _reent*, char *, size_t *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int	_EXFUN(_vasprintf_r, (struct _reent *, char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vdprintf_r, (struct _reent *, int, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int	_EXFUN(_vfprintf_r, (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vfscanf_r, (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int	_EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(_vprintf_r, (struct _reent *, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(_vscanf_r, (struct _reent *, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int	_EXFUN(_vsiprintf_r, (struct _reent *, char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int	_EXFUN(_vsniprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int	_EXFUN(_vsnprintf_r, (struct _reent *, char *__restrict, size_t, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int	_EXFUN(_vsprintf_r, (struct _reent *, char *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vsscanf_r, (struct _reent *, const char *__restrict, const char *__restrict, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
+int	_fgetpos_r (struct _reent *, FILE *, fpos_t *);
+int	_fsetpos_r (struct _reent *, FILE *, const fpos_t *);
+#endif
+int	_fiprintf_r (struct _reent *, FILE *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_fiscanf_r (struct _reent *, FILE *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+FILE *	_fmemopen_r (struct _reent *, void *__restrict, size_t, const char *__restrict);
+FILE *	_fopen_r (struct _reent *, const char *__restrict, const char *__restrict);
+FILE *	_freopen_r (struct _reent *, const char *__restrict, const char *__restrict, FILE *__restrict);
+int	_fprintf_r (struct _reent *, FILE *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_fpurge_r (struct _reent *, FILE *);
+int	_fputc_r (struct _reent *, int, FILE *);
+int	_fputc_unlocked_r (struct _reent *, int, FILE *);
+int	_fputs_r (struct _reent *, const char *__restrict, FILE *__restrict);
+int	_fputs_unlocked_r (struct _reent *, const char *__restrict, FILE *__restrict);
+size_t	_fread_r (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t	_fread_unlocked_r (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+int	_fscanf_r (struct _reent *, FILE *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+int	_fseek_r (struct _reent *, FILE *, long, int);
+int	_fseeko_r (struct _reent *, FILE *, _off_t, int);
+long	_ftell_r (struct _reent *, FILE *);
+_off_t	_ftello_r (struct _reent *, FILE *);
+void	_rewind_r (struct _reent *, FILE *);
+size_t	_fwrite_r (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t	_fwrite_unlocked_r (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+int	_getc_r (struct _reent *, FILE *);
+int	_getc_unlocked_r (struct _reent *, FILE *);
+int	_getchar_r (struct _reent *);
+int	_getchar_unlocked_r (struct _reent *);
+char *	_gets_r (struct _reent *, char *);
+int	_iprintf_r (struct _reent *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	_iscanf_r (struct _reent *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+FILE *	_open_memstream_r (struct _reent *, char **, size_t *);
+void	_perror_r (struct _reent *, const char *);
+int	_printf_r (struct _reent *, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int	_putc_r (struct _reent *, int, FILE *);
+int	_putc_unlocked_r (struct _reent *, int, FILE *);
+int	_putchar_unlocked_r (struct _reent *, int);
+int	_putchar_r (struct _reent *, int);
+int	_puts_r (struct _reent *, const char *);
+int	_remove_r (struct _reent *, const char *);
+int	_rename_r (struct _reent *,
+			   const char *_old, const char *_new);
+int	_scanf_r (struct _reent *, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int	_siprintf_r (struct _reent *, char *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_siscanf_r (struct _reent *, const char *, const char *, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+int	_sniprintf_r (struct _reent *, char *, size_t, const char *, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int	_snprintf_r (struct _reent *, char *__restrict, size_t, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int	_sprintf_r (struct _reent *, char *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int	_sscanf_r (struct _reent *, const char *__restrict, const char *__restrict, ...)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+char *	_tempnam_r (struct _reent *, const char *, const char *);
+FILE *	_tmpfile_r (struct _reent *);
+char *	_tmpnam_r (struct _reent *, char *);
+int	_ungetc_r (struct _reent *, int, FILE *);
+int	_vasiprintf_r (struct _reent *, char **, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+char *	_vasniprintf_r (struct _reent*, char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+char *	_vasnprintf_r (struct _reent*, char *, size_t *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int	_vasprintf_r (struct _reent *, char **, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vdiprintf_r (struct _reent *, int, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vdprintf_r (struct _reent *, int, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int	_vfprintf_r (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vfscanf_r (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int	_viprintf_r (struct _reent *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	_viscanf_r (struct _reent *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	_vprintf_r (struct _reent *, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int	_vscanf_r (struct _reent *, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int	_vsiprintf_r (struct _reent *, char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vsiscanf_r (struct _reent *, const char *, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int	_vsniprintf_r (struct _reent *, char *, size_t, const char *, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int	_vsnprintf_r (struct _reent *, char *__restrict, size_t, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int	_vsprintf_r (struct _reent *, char *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	_vsscanf_r (struct _reent *, const char *__restrict, const char *__restrict, __VALIST)
+               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
 
 /* Other extensions.  */
 
-int	_EXFUN(fpurge, (FILE *));
-ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
-ssize_t _EXFUN(__getline, (char **, size_t *, FILE *));
+int	fpurge (FILE *);
+ssize_t __getdelim (char **, size_t *, int, FILE *);
+ssize_t __getline (char **, size_t *, FILE *);
 
 #if __MISC_VISIBLE
-void	_EXFUN(clearerr_unlocked, (FILE *));
-int	_EXFUN(feof_unlocked, (FILE *));
-int	_EXFUN(ferror_unlocked, (FILE *));
-int	_EXFUN(fileno_unlocked, (FILE *));
-int	_EXFUN(fflush_unlocked, (FILE *));
-int	_EXFUN(fgetc_unlocked, (FILE *));
-int	_EXFUN(fputc_unlocked, (int, FILE *));
-size_t	_EXFUN(fread_unlocked, (void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t	_EXFUN(fwrite_unlocked, (const void *__restrict , size_t _size, size_t _n, FILE *));
+void	clearerr_unlocked (FILE *);
+int	feof_unlocked (FILE *);
+int	ferror_unlocked (FILE *);
+int	fileno_unlocked (FILE *);
+int	fflush_unlocked (FILE *);
+int	fgetc_unlocked (FILE *);
+int	fputc_unlocked (int, FILE *);
+size_t	fread_unlocked (void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t	fwrite_unlocked (const void *__restrict , size_t _size, size_t _n, FILE *);
 #endif
 
 #if __GNU_VISIBLE
-char *  _EXFUN(fgets_unlocked, (char *__restrict, int, FILE *__restrict));
-int	_EXFUN(fputs_unlocked, (const char *__restrict, FILE *__restrict));
+char *  fgets_unlocked (char *__restrict, int, FILE *__restrict);
+int	fputs_unlocked (const char *__restrict, FILE *__restrict);
 #endif
 
 #ifdef __LARGE64_FILES
 #if !defined(__CYGWIN__) || defined(_COMPILING_NEWLIB)
-FILE *	_EXFUN(fdopen64, (int, const char *));
-FILE *  _EXFUN(fopen64, (const char *, const char *));
-FILE *  _EXFUN(freopen64, (const char *, const char *, FILE *));
-_off64_t _EXFUN(ftello64, (FILE *));
-_off64_t _EXFUN(fseeko64, (FILE *, _off64_t, int));
-int     _EXFUN(fgetpos64, (FILE *, _fpos64_t *));
-int     _EXFUN(fsetpos64, (FILE *, const _fpos64_t *));
-FILE *  _EXFUN(tmpfile64, (void));
-
-FILE *	_EXFUN(_fdopen64_r, (struct _reent *, int, const char *));
-FILE *  _EXFUN(_fopen64_r, (struct _reent *,const char *, const char *));
-FILE *  _EXFUN(_freopen64_r, (struct _reent *, const char *, const char *, FILE *));
-_off64_t _EXFUN(_ftello64_r, (struct _reent *, FILE *));
-_off64_t _EXFUN(_fseeko64_r, (struct _reent *, FILE *, _off64_t, int));
-int     _EXFUN(_fgetpos64_r, (struct _reent *, FILE *, _fpos64_t *));
-int     _EXFUN(_fsetpos64_r, (struct _reent *, FILE *, const _fpos64_t *));
-FILE *  _EXFUN(_tmpfile64_r, (struct _reent *));
+FILE *	fdopen64 (int, const char *);
+FILE *  fopen64 (const char *, const char *);
+FILE *  freopen64 (const char *, const char *, FILE *);
+_off64_t ftello64 (FILE *);
+_off64_t fseeko64 (FILE *, _off64_t, int);
+int     fgetpos64 (FILE *, _fpos64_t *);
+int     fsetpos64 (FILE *, const _fpos64_t *);
+FILE *  tmpfile64 (void);
+
+FILE *	_fdopen64_r (struct _reent *, int, const char *);
+FILE *  _fopen64_r (struct _reent *,const char *, const char *);
+FILE *  _freopen64_r (struct _reent *, const char *, const char *, FILE *);
+_off64_t _ftello64_r (struct _reent *, FILE *);
+_off64_t _fseeko64_r (struct _reent *, FILE *, _off64_t, int);
+int     _fgetpos64_r (struct _reent *, FILE *, _fpos64_t *);
+int     _fsetpos64_r (struct _reent *, FILE *, const _fpos64_t *);
+FILE *  _tmpfile64_r (struct _reent *);
 #endif /* !__CYGWIN__ */
 #endif /* __LARGE64_FILES */
 
@@ -574,8 +574,8 @@ FILE *  _EXFUN(_tmpfile64_r, (struct _reent *));
  * Routines internal to the implementation.
  */
 
-int	_EXFUN(__srget_r, (struct _reent *, FILE *));
-int	_EXFUN(__swbuf_r, (struct _reent *, int, FILE *));
+int	__srget_r (struct _reent *, FILE *);
+int	__swbuf_r (struct _reent *, int, FILE *);
 
 /*
  * Stdio function-access interface.
@@ -583,35 +583,35 @@ int	_EXFUN(__swbuf_r, (struct _reent *, int, FILE *));
 
 #if __BSD_VISIBLE
 # ifdef __LARGE64_FILES
-FILE	*_EXFUN(funopen,(const void *__cookie,
+FILE	*funopen (const void *__cookie,
 		int (*__readfn)(void *__c, char *__buf,
 				_READ_WRITE_BUFSIZE_TYPE __n),
 		int (*__writefn)(void *__c, const char *__buf,
 				 _READ_WRITE_BUFSIZE_TYPE __n),
 		_fpos64_t (*__seekfn)(void *__c, _fpos64_t __off, int __whence),
-		int (*__closefn)(void *__c)));
-FILE	*_EXFUN(_funopen_r,(struct _reent *, const void *__cookie,
+		int (*__closefn)(void *__c));
+FILE	*_funopen_r (struct _reent *, const void *__cookie,
 		int (*__readfn)(void *__c, char *__buf,
 				_READ_WRITE_BUFSIZE_TYPE __n),
 		int (*__writefn)(void *__c, const char *__buf,
 				 _READ_WRITE_BUFSIZE_TYPE __n),
 		_fpos64_t (*__seekfn)(void *__c, _fpos64_t __off, int __whence),
-		int (*__closefn)(void *__c)));
+		int (*__closefn)(void *__c));
 # else
-FILE	*_EXFUN(funopen,(const void *__cookie,
+FILE	*funopen (const void *__cookie,
 		int (*__readfn)(void *__cookie, char *__buf,
 				_READ_WRITE_BUFSIZE_TYPE __n),
 		int (*__writefn)(void *__cookie, const char *__buf,
 				 _READ_WRITE_BUFSIZE_TYPE __n),
 		fpos_t (*__seekfn)(void *__cookie, fpos_t __off, int __whence),
-		int (*__closefn)(void *__cookie)));
-FILE	*_EXFUN(_funopen_r,(struct _reent *, const void *__cookie,
+		int (*__closefn)(void *__cookie));
+FILE	*_funopen_r (struct _reent *, const void *__cookie,
 		int (*__readfn)(void *__cookie, char *__buf,
 				_READ_WRITE_BUFSIZE_TYPE __n),
 		int (*__writefn)(void *__cookie, const char *__buf,
 				 _READ_WRITE_BUFSIZE_TYPE __n),
 		fpos_t (*__seekfn)(void *__cookie, fpos_t __off, int __whence),
-		int (*__closefn)(void *__cookie)));
+		int (*__closefn)(void *__cookie));
 # endif /* !__LARGE64_FILES */
 
 # define	fropen(__cookie, __fn) funopen(__cookie, __fn, (int (*)())0, \
@@ -640,10 +640,10 @@ typedef struct
   cookie_seek_function_t  *seek;
   cookie_close_function_t *close;
 } cookie_io_functions_t;
-FILE *_EXFUN(fopencookie,(void *__cookie,
-		const char *__mode, cookie_io_functions_t __functions));
-FILE *_EXFUN(_fopencookie_r,(struct _reent *, void *__cookie,
-		const char *__mode, cookie_io_functions_t __functions));
+FILE *fopencookie (void *__cookie,
+		const char *__mode, cookie_io_functions_t __functions);
+FILE *_fopencookie_r (struct _reent *, void *__cookie,
+		const char *__mode, cookie_io_functions_t __functions);
 #endif /* __GNU_VISIBLE */
 
 #ifndef __CUSTOM_FILE_IO__
diff --git a/newlib/libc/include/stdio_ext.h b/newlib/libc/include/stdio_ext.h
index 029ab02..231262d 100644
--- a/newlib/libc/include/stdio_ext.h
+++ b/newlib/libc/include/stdio_ext.h
@@ -19,8 +19,8 @@
 
 _BEGIN_STD_C
 
-void	 _EXFUN(__fpurge,(FILE *));
-int	 _EXFUN(__fsetlocking,(FILE *, int));
+void	 __fpurge (FILE *);
+int	 __fsetlocking (FILE *, int);
 
 /* TODO:
 
@@ -52,13 +52,13 @@ __fpending (FILE *__fp) { return __fp->_p - __fp->_bf._base; }
 
 #else
 
-size_t	 _EXFUN(__fbufsize,(FILE *));
-int	 _EXFUN(__freading,(FILE *));
-int	 _EXFUN(__fwriting,(FILE *));
-int	 _EXFUN(__freadable,(FILE *));
-int	 _EXFUN(__fwritable,(FILE *));
-int	 _EXFUN(__flbf,(FILE *));
-size_t	 _EXFUN(__fpending,(FILE *));
+size_t	 __fbufsize (FILE *);
+int	 __freading (FILE *);
+int	 __fwriting (FILE *);
+int	 __freadable (FILE *);
+int	 __fwritable (FILE *);
+int	 __flbf (FILE *);
+size_t	 __fpending (FILE *);
 
 #ifndef __cplusplus
 
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index 80f15f4..ef0e4bd 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -62,102 +62,102 @@ typedef int (*__compar_fn_t) (const void *, const void *);
 
 #define RAND_MAX __RAND_MAX
 
-int	_EXFUN(__locale_mb_cur_max,(void));
+int	__locale_mb_cur_max (void);
 
 #define MB_CUR_MAX __locale_mb_cur_max()
 
-void	_EXFUN(abort,(void) _ATTRIBUTE ((__noreturn__)));
-int	_EXFUN(abs,(int));
+void	abort (void) _ATTRIBUTE ((__noreturn__));
+int	abs (int);
 #if __BSD_VISIBLE
-__uint32_t _EXFUN(arc4random, (void));
-__uint32_t _EXFUN(arc4random_uniform, (__uint32_t));
-void    _EXFUN(arc4random_buf, (void *, size_t));
+__uint32_t arc4random (void);
+__uint32_t arc4random_uniform (__uint32_t);
+void    arc4random_buf (void *, size_t);
 #endif
-int	_EXFUN(atexit,(void (*__func)(void)));
-double	_EXFUN(atof,(const char *__nptr));
+int	atexit (void (*__func)(void));
+double	atof (const char *__nptr);
 #if __MISC_VISIBLE
-float	_EXFUN(atoff,(const char *__nptr));
+float	atoff (const char *__nptr);
 #endif
-int	_EXFUN(atoi,(const char *__nptr));
-int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
-long	_EXFUN(atol,(const char *__nptr));
-long	_EXFUN(_atol_r,(struct _reent *, const char *__nptr));
-void *	_EXFUN(bsearch,(const void *__key,
+int	atoi (const char *__nptr);
+int	_atoi_r (struct _reent *, const char *__nptr);
+long	atol (const char *__nptr);
+long	_atol_r (struct _reent *, const char *__nptr);
+void *	bsearch (const void *__key,
 		       const void *__base,
 		       size_t __nmemb,
 		       size_t __size,
-		       __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 *));
-char *  _EXFUN(getenv,(const char *__string));
-char *	_EXFUN(_getenv_r,(struct _reent *, const char *__string));
-char *	_EXFUN(_findenv,(const char *, int *));
-char *	_EXFUN(_findenv_r,(struct _reent *, const char *, int *));
+		       __compar_fn_t _compar);
+void *	calloc (size_t __nmemb, size_t __size) _NOTHROW;
+div_t	div (int __numer, int __denom);
+void	exit (int __status) _ATTRIBUTE ((__noreturn__));
+void	free (void *) _NOTHROW;
+char *  getenv (const char *__string);
+char *	_getenv_r (struct _reent *, const char *__string);
+char *	_findenv (const char *, int *);
+char *	_findenv_r (struct _reent *, const char *, int *);
 #if __POSIX_VISIBLE >= 200809
 extern char *suboptarg;			/* getsubopt(3) external variable */
-int	_EXFUN(getsubopt,(char **, char * const *, char **));
-#endif
-long	_EXFUN(labs,(long));
-ldiv_t	_EXFUN(ldiv,(long __numer, long __denom));
-void *	_EXFUN_NOTHROW(malloc,(size_t __size));
-int	_EXFUN(mblen,(const char *, size_t));
-int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
-int	_EXFUN(mbtowc,(wchar_t *__restrict, const char *__restrict, size_t));
-int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *));
-int	_EXFUN(wctomb,(char *, wchar_t));
-int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
-size_t	_EXFUN(mbstowcs,(wchar_t *__restrict, const char *__restrict, size_t));
-size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *));
-size_t	_EXFUN(wcstombs,(char *__restrict, const wchar_t *__restrict, size_t));
-size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *__restrict, const wchar_t *__restrict, size_t, _mbstate_t *));
+int	getsubopt (char **, char * const *, char **);
+#endif
+long	labs (long);
+ldiv_t	ldiv (long __numer, long __denom);
+void *	malloc (size_t __size) _NOTHROW;
+int	mblen (const char *, size_t);
+int	_mblen_r (struct _reent *, const char *, size_t, _mbstate_t *);
+int	mbtowc (wchar_t *__restrict, const char *__restrict, size_t);
+int	_mbtowc_r (struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *);
+int	wctomb (char *, wchar_t);
+int	_wctomb_r (struct _reent *, char *, wchar_t, _mbstate_t *);
+size_t	mbstowcs (wchar_t *__restrict, const char *__restrict, size_t);
+size_t	_mbstowcs_r (struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *);
+size_t	wcstombs (char *__restrict, const wchar_t *__restrict, size_t);
+size_t	_wcstombs_r (struct _reent *, char *__restrict, const wchar_t *__restrict, size_t, _mbstate_t *);
 #ifndef _REENT_ONLY
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
-char *	_EXFUN(mkdtemp,(char *));
+char *	mkdtemp (char *);
 #endif
 #if __GNU_VISIBLE
-int	_EXFUN(mkostemp,(char *, int));
-int	_EXFUN(mkostemps,(char *, int, int));
+int	mkostemp (char *, int);
+int	mkostemps (char *, int, int);
 #endif
 #if __MISC_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 4
-int	_EXFUN(mkstemp,(char *));
+int	mkstemp (char *);
 #endif
 #if __MISC_VISIBLE
-int	_EXFUN(mkstemps,(char *, int));
+int	mkstemps (char *, int);
 #endif
 #if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-char *	_EXFUN(mktemp,(char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead"))));
+char *	mktemp (char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead")));
 #endif
 #endif /* !_REENT_ONLY */
-char *	_EXFUN(_mkdtemp_r, (struct _reent *, char *));
-int	_EXFUN(_mkostemp_r, (struct _reent *, char *, int));
-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 `mkt[...]

[diff truncated at 100000 bytes]


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]