ansification: remove _EXFUN, _EXFUN_NOTHROW

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

1 files changed, 163 insertions, 163 deletions

diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index dccc106..c848342 100644
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -86,90 +86,90 @@ struct tm;
 typedef _mbstate_t mbstate_t;
 #endif /* _MBSTATE_T */
 
-wint_t	_EXFUN(btowc, (int));
-int	_EXFUN(wctob, (wint_t));
-size_t	_EXFUN(mbrlen, (const char *__restrict, size_t, mbstate_t *__restrict));
-size_t	_EXFUN(mbrtowc, (wchar_t *__restrict, const char *__restrict, size_t,
-						mbstate_t *__restrict));
-size_t	_EXFUN(_mbrtowc_r, (struct _reent *, wchar_t * , const char * , 
-			size_t, mbstate_t *));
-int	_EXFUN(mbsinit, (const mbstate_t *));
+wint_t	btowc (int);
+int	wctob (wint_t);
+size_t	mbrlen (const char *__restrict, size_t, mbstate_t *__restrict);
+size_t	mbrtowc (wchar_t *__restrict, const char *__restrict, size_t,
+						mbstate_t *__restrict);
+size_t	_mbrtowc_r (struct _reent *, wchar_t * , const char * , 
+			size_t, mbstate_t *);
+int	mbsinit (const mbstate_t *);
 #if __POSIX_VISIBLE >= 200809
-size_t	_EXFUN(mbsnrtowcs, (wchar_t *__restrict, const char **__restrict,
-				size_t, size_t, mbstate_t *__restrict));
-#endif
-size_t	_EXFUN(_mbsnrtowcs_r, (struct _reent *, wchar_t * , const char ** ,
-			size_t, size_t, mbstate_t *));
-size_t	_EXFUN(mbsrtowcs, (wchar_t *__restrict, const char **__restrict, size_t,
-				mbstate_t *__restrict));
-size_t	_EXFUN(_mbsrtowcs_r, (struct _reent *, wchar_t * , const char ** , size_t, mbstate_t *));
-size_t	_EXFUN(wcrtomb, (char *__restrict, wchar_t, mbstate_t *__restrict));
-size_t	_EXFUN(_wcrtomb_r, (struct _reent *, char * , wchar_t, mbstate_t *));
+size_t	mbsnrtowcs (wchar_t *__restrict, const char **__restrict,
+				size_t, size_t, mbstate_t *__restrict);
+#endif
+size_t	_mbsnrtowcs_r (struct _reent *, wchar_t * , const char ** ,
+			size_t, size_t, mbstate_t *);
+size_t	mbsrtowcs (wchar_t *__restrict, const char **__restrict, size_t,
+				mbstate_t *__restrict);
+size_t	_mbsrtowcs_r (struct _reent *, wchar_t * , const char ** , size_t, mbstate_t *);
+size_t	wcrtomb (char *__restrict, wchar_t, mbstate_t *__restrict);
+size_t	_wcrtomb_r (struct _reent *, char * , wchar_t, mbstate_t *);
 #if __POSIX_VISIBLE >= 200809
-size_t	_EXFUN(wcsnrtombs, (char *__restrict, const wchar_t **__restrict,
-				size_t, size_t, mbstate_t *__restrict));
-#endif
-size_t	_EXFUN(_wcsnrtombs_r, (struct _reent *, char * , const wchar_t ** , 
-			size_t, size_t, mbstate_t *));
-size_t	_EXFUN(wcsrtombs, (char *__restrict, const wchar_t **__restrict,
-				size_t, mbstate_t *__restrict));
-size_t	_EXFUN(_wcsrtombs_r, (struct _reent *, char * , const wchar_t ** , 
-			size_t, mbstate_t *));
+size_t	wcsnrtombs (char *__restrict, const wchar_t **__restrict,
+				size_t, size_t, mbstate_t *__restrict);
+#endif
+size_t	_wcsnrtombs_r (struct _reent *, char * , const wchar_t ** , 
+			size_t, size_t, mbstate_t *);
+size_t	wcsrtombs (char *__restrict, const wchar_t **__restrict,
+				size_t, mbstate_t *__restrict);
+size_t	_wcsrtombs_r (struct _reent *, char * , const wchar_t ** , 
+			size_t, mbstate_t *);
 #if __POSIX_VISIBLE >= 200809
-int	_EXFUN(wcscasecmp, (const wchar_t *, const wchar_t *));
+int	wcscasecmp (const wchar_t *, const wchar_t *);
 #endif
-wchar_t	*_EXFUN(wcscat, (wchar_t *__restrict, const wchar_t *__restrict));
-wchar_t	*_EXFUN(wcschr, (const wchar_t *, wchar_t));
-int	_EXFUN(wcscmp, (const wchar_t *, const wchar_t *));
-int	_EXFUN(wcscoll, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcscpy, (wchar_t *__restrict, const wchar_t *__restrict));
+wchar_t	*wcscat (wchar_t *__restrict, const wchar_t *__restrict);
+wchar_t	*wcschr (const wchar_t *, wchar_t);
+int	wcscmp (const wchar_t *, const wchar_t *);
+int	wcscoll (const wchar_t *, const wchar_t *);
+wchar_t	*wcscpy (wchar_t *__restrict, const wchar_t *__restrict);
 #if __POSIX_VISIBLE >= 200809
-wchar_t	*_EXFUN(wcpcpy, (wchar_t *__restrict,
-				 const wchar_t *__restrict));
-wchar_t	*_EXFUN(wcsdup, (const wchar_t *));
-#endif
-wchar_t	*_EXFUN(_wcsdup_r, (struct _reent *, const wchar_t * ));
-size_t	_EXFUN(wcscspn, (const wchar_t *, const wchar_t *));
-size_t  _EXFUN(wcsftime, (wchar_t *__restrict, size_t,
-				const wchar_t *__restrict, const struct tm *__restrict));
+wchar_t	*wcpcpy (wchar_t *__restrict,
+				 const wchar_t *__restrict);
+wchar_t	*wcsdup (const wchar_t *);
+#endif
+wchar_t	*_wcsdup_r (struct _reent *, const wchar_t * );
+size_t	wcscspn (const wchar_t *, const wchar_t *);
+size_t  wcsftime (wchar_t *__restrict, size_t,
+				const wchar_t *__restrict, const struct tm *__restrict);
 #if __GNU_VISIBLE
 size_t  wcsftime_l (wchar_t *__restrict, size_t, const wchar_t *__restrict,
 		    const struct tm *__restrict, locale_t);
 #endif
-size_t	_EXFUN(wcslcat, (wchar_t *, const wchar_t *, size_t));
-size_t	_EXFUN(wcslcpy, (wchar_t *, const wchar_t *, size_t));
-size_t	_EXFUN(wcslen, (const wchar_t *));
+size_t	wcslcat (wchar_t *, const wchar_t *, size_t);
+size_t	wcslcpy (wchar_t *, const wchar_t *, size_t);
+size_t	wcslen (const wchar_t *);
 #if __POSIX_VISIBLE >= 200809
-int	_EXFUN(wcsncasecmp, (const wchar_t *, const wchar_t *, size_t));
+int	wcsncasecmp (const wchar_t *, const wchar_t *, size_t);
 #endif
-wchar_t	*_EXFUN(wcsncat, (wchar_t *__restrict,
-				 const wchar_t *__restrict, size_t));
-int	_EXFUN(wcsncmp, (const wchar_t *, const wchar_t *, size_t));
-wchar_t	*_EXFUN(wcsncpy, (wchar_t *__restrict,
-				 const wchar_t *__restrict, size_t));
+wchar_t	*wcsncat (wchar_t *__restrict,
+				 const wchar_t *__restrict, size_t);
+int	wcsncmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t	*wcsncpy (wchar_t *__restrict,
+				 const wchar_t *__restrict, size_t);
 #if __POSIX_VISIBLE >= 200809
-wchar_t	*_EXFUN(wcpncpy, (wchar_t *__restrict,
-				 const wchar_t *__restrict, size_t));
-size_t	_EXFUN(wcsnlen, (const wchar_t *, size_t));
-#endif
-wchar_t	*_EXFUN(wcspbrk, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcsrchr, (const wchar_t *, wchar_t));
-size_t	_EXFUN(wcsspn, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcsstr, (const wchar_t *__restrict,
-				 const wchar_t *__restrict));
-wchar_t	*_EXFUN(wcstok, (wchar_t *__restrict, const wchar_t *__restrict,
-				 wchar_t **__restrict));
-double _EXFUN(wcstod, (const wchar_t *__restrict, wchar_t **__restrict));
-double _EXFUN(_wcstod_r, (struct _reent *, const wchar_t *, wchar_t **));
+wchar_t	*wcpncpy (wchar_t *__restrict,
+				 const wchar_t *__restrict, size_t);
+size_t	wcsnlen (const wchar_t *, size_t);
+#endif
+wchar_t	*wcspbrk (const wchar_t *, const wchar_t *);
+wchar_t	*wcsrchr (const wchar_t *, wchar_t);
+size_t	wcsspn (const wchar_t *, const wchar_t *);
+wchar_t	*wcsstr (const wchar_t *__restrict,
+				 const wchar_t *__restrict);
+wchar_t	*wcstok (wchar_t *__restrict, const wchar_t *__restrict,
+				 wchar_t **__restrict);
+double wcstod (const wchar_t *__restrict, wchar_t **__restrict);
+double _wcstod_r (struct _reent *, const wchar_t *, wchar_t **);
 #if __ISO_C_VISIBLE >= 1999
-float _EXFUN(wcstof, (const wchar_t *__restrict, wchar_t **__restrict));
+float wcstof (const wchar_t *__restrict, wchar_t **__restrict);
 #endif
-float _EXFUN(_wcstof_r, (struct _reent *, const wchar_t *, wchar_t **));
+float _wcstof_r (struct _reent *, const wchar_t *, wchar_t **);
 #if __XSI_VISIBLE
-int	_EXFUN(wcswidth, (const wchar_t *, size_t));
+int	wcswidth (const wchar_t *, size_t);
 #endif
-size_t	_EXFUN(wcsxfrm, (wchar_t *__restrict, const wchar_t *__restrict,
-				size_t));
+size_t	wcsxfrm (wchar_t *__restrict, const wchar_t *__restrict,
+				size_t);
 #if __POSIX_VISIBLE >= 200809
 extern int wcscasecmp_l (const wchar_t *, const wchar_t *, locale_t);
 extern int wcsncasecmp_l (const wchar_t *, const wchar_t *, size_t, locale_t);
@@ -179,36 +179,36 @@ extern size_t wcsxfrm_l (wchar_t *__restrict, const wchar_t *__restrict, size_t,
 #endif
 
 #if __XSI_VISIBLE
-int	_EXFUN(wcwidth, (const wchar_t));
+int	wcwidth (const wchar_t);
 #endif
-wchar_t	*_EXFUN(wmemchr, (const wchar_t *, wchar_t, size_t));
-int	_EXFUN(wmemcmp, (const wchar_t *, const wchar_t *, size_t));
-wchar_t	*_EXFUN(wmemcpy, (wchar_t *__restrict, const wchar_t *__restrict,
-				 size_t));
-wchar_t	*_EXFUN(wmemmove, (wchar_t *, const wchar_t *, size_t));
+wchar_t	*wmemchr (const wchar_t *, wchar_t, size_t);
+int	wmemcmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t	*wmemcpy (wchar_t *__restrict, const wchar_t *__restrict,
+				 size_t);
+wchar_t	*wmemmove (wchar_t *, const wchar_t *, size_t);
 #if __GNU_VISIBLE
-wchar_t	*_EXFUN(wmempcpy, (wchar_t *__restrict, const wchar_t *__restrict,
-				 size_t));
+wchar_t	*wmempcpy (wchar_t *__restrict, const wchar_t *__restrict,
+				 size_t);
 #endif
-wchar_t	*_EXFUN(wmemset, (wchar_t *, wchar_t, size_t));
+wchar_t	*wmemset (wchar_t *, wchar_t, size_t);
 
-long    _EXFUN(wcstol, (const wchar_t *__restrict, wchar_t **__restrict, int));
+long    wcstol (const wchar_t *__restrict, wchar_t **__restrict, int);
 #if __ISO_C_VISIBLE >= 1999
-long long _EXFUN(wcstoll, (const wchar_t *__restrict, wchar_t **__restrict,
-				  int));
+long long wcstoll (const wchar_t *__restrict, wchar_t **__restrict,
+				  int);
 #endif
-unsigned long _EXFUN(wcstoul, (const wchar_t *__restrict, wchar_t **__restrict,
-					  int));
+unsigned long wcstoul (const wchar_t *__restrict, wchar_t **__restrict,
+					  int);
 #if __ISO_C_VISIBLE >= 1999
-unsigned long long _EXFUN(wcstoull, (const wchar_t *__restrict,
-						   wchar_t **__restrict, int));
+unsigned long long wcstoull (const wchar_t *__restrict,
+						   wchar_t **__restrict, int);
 #endif
-long    _EXFUN(_wcstol_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-long long _EXFUN(_wcstoll_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-unsigned long _EXFUN(_wcstoul_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-unsigned long long _EXFUN(_wcstoull_r, (struct _reent *, const wchar_t *, wchar_t **, int));
+long    _wcstol_r (struct _reent *, const wchar_t *, wchar_t **, int);
+long long _wcstoll_r (struct _reent *, const wchar_t *, wchar_t **, int);
+unsigned long _wcstoul_r (struct _reent *, const wchar_t *, wchar_t **, int);
+unsigned long long _wcstoull_r (struct _reent *, const wchar_t *, wchar_t **, int);
 #if __ISO_C_VISIBLE >= 1999
-long double _EXFUN(wcstold, (const wchar_t *, wchar_t **));
+long double wcstold (const wchar_t *, wchar_t **);
 #endif
 
 #if __GNU_VISIBLE
@@ -224,53 +224,53 @@ float wcstof_l (const wchar_t *, wchar_t **, locale_t);
 long double wcstold_l (const wchar_t *, wchar_t **, locale_t);
 #endif
 
-wint_t _EXFUN(fgetwc, (__FILE *));
-wchar_t *_EXFUN(fgetws, (wchar_t *__restrict, int, __FILE *__restrict));
-wint_t _EXFUN(fputwc, (wchar_t, __FILE *));
-int _EXFUN(fputws, (const wchar_t *__restrict, __FILE *__restrict));
+wint_t fgetwc (__FILE *);
+wchar_t *fgetws (wchar_t *__restrict, int, __FILE *__restrict);
+wint_t fputwc (wchar_t, __FILE *);
+int fputws (const wchar_t *__restrict, __FILE *__restrict);
 #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int _EXFUN (fwide, (__FILE *, int));
-#endif
-wint_t _EXFUN (getwc, (__FILE *));
-wint_t _EXFUN (getwchar, (void));
-wint_t _EXFUN(putwc, (wchar_t, __FILE *));
-wint_t _EXFUN(putwchar, (wchar_t));
-wint_t _EXFUN (ungetwc, (wint_t wc, __FILE *));
-
-wint_t _EXFUN(_fgetwc_r, (struct _reent *, __FILE *));
-wint_t _EXFUN(_fgetwc_unlocked_r, (struct _reent *, __FILE *));
-wchar_t *_EXFUN(_fgetws_r, (struct _reent *, wchar_t *, int, __FILE *));
-wchar_t *_EXFUN(_fgetws_unlocked_r, (struct _reent *, wchar_t *, int, __FILE *));
-wint_t _EXFUN(_fputwc_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_fputwc_unlocked_r, (struct _reent *, wchar_t, __FILE *));
-int _EXFUN(_fputws_r, (struct _reent *, const wchar_t *, __FILE *));
-int _EXFUN(_fputws_unlocked_r, (struct _reent *, const wchar_t *, __FILE *));
-int _EXFUN (_fwide_r, (struct _reent *, __FILE *, int));
-wint_t _EXFUN (_getwc_r, (struct _reent *, __FILE *));
-wint_t _EXFUN (_getwc_unlocked_r, (struct _reent *, __FILE *));
-wint_t _EXFUN (_getwchar_r, (struct _reent *ptr));
-wint_t _EXFUN (_getwchar_unlocked_r, (struct _reent *ptr));
-wint_t _EXFUN(_putwc_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_putwc_unlocked_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_putwchar_r, (struct _reent *, wchar_t));
-wint_t _EXFUN(_putwchar_unlocked_r, (struct _reent *, wchar_t));
-wint_t _EXFUN (_ungetwc_r, (struct _reent *, wint_t wc, __FILE *));
+int fwide (__FILE *, int);
+#endif
+wint_t getwc (__FILE *);
+wint_t getwchar (void);
+wint_t putwc (wchar_t, __FILE *);
+wint_t putwchar (wchar_t);
+wint_t ungetwc (wint_t wc, __FILE *);
+
+wint_t _fgetwc_r (struct _reent *, __FILE *);
+wint_t _fgetwc_unlocked_r (struct _reent *, __FILE *);
+wchar_t *_fgetws_r (struct _reent *, wchar_t *, int, __FILE *);
+wchar_t *_fgetws_unlocked_r (struct _reent *, wchar_t *, int, __FILE *);
+wint_t _fputwc_r (struct _reent *, wchar_t, __FILE *);
+wint_t _fputwc_unlocked_r (struct _reent *, wchar_t, __FILE *);
+int _fputws_r (struct _reent *, const wchar_t *, __FILE *);
+int _fputws_unlocked_r (struct _reent *, const wchar_t *, __FILE *);
+int _fwide_r (struct _reent *, __FILE *, int);
+wint_t _getwc_r (struct _reent *, __FILE *);
+wint_t _getwc_unlocked_r (struct _reent *, __FILE *);
+wint_t _getwchar_r (struct _reent *ptr);
+wint_t _getwchar_unlocked_r (struct _reent *ptr);
+wint_t _putwc_r (struct _reent *, wchar_t, __FILE *);
+wint_t _putwc_unlocked_r (struct _reent *, wchar_t, __FILE *);
+wint_t _putwchar_r (struct _reent *, wchar_t);
+wint_t _putwchar_unlocked_r (struct _reent *, wchar_t);
+wint_t _ungetwc_r (struct _reent *, wint_t wc, __FILE *);
 
 #if __GNU_VISIBLE
-wint_t _EXFUN(fgetwc_unlocked, (__FILE *));
-wchar_t *_EXFUN(fgetws_unlocked, (wchar_t *__restrict, int, __FILE *__restrict));
-wint_t _EXFUN(fputwc_unlocked, (wchar_t, __FILE *));
-int _EXFUN(fputws_unlocked, (const wchar_t *__restrict, __FILE *__restrict));
-wint_t _EXFUN(getwc_unlocked, (__FILE *));
-wint_t _EXFUN(getwchar_unlocked, (void));
-wint_t _EXFUN(putwc_unlocked, (wchar_t, __FILE *));
-wint_t _EXFUN(putwchar_unlocked, (wchar_t));
+wint_t fgetwc_unlocked (__FILE *);
+wchar_t *fgetws_unlocked (wchar_t *__restrict, int, __FILE *__restrict);
+wint_t fputwc_unlocked (wchar_t, __FILE *);
+int fputws_unlocked (const wchar_t *__restrict, __FILE *__restrict);
+wint_t getwc_unlocked (__FILE *);
+wint_t getwchar_unlocked (void);
+wint_t putwc_unlocked (wchar_t, __FILE *);
+wint_t putwchar_unlocked (wchar_t);
 #endif
 
 #if __POSIX_VISIBLE >= 200809
-__FILE *_EXFUN (open_wmemstream, (wchar_t **, size_t *));
+__FILE *open_wmemstream (wchar_t **, size_t *);
 #endif
-__FILE *_EXFUN (_open_wmemstream_r, (struct _reent *, wchar_t **, size_t *));
+__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *);
 
 #ifndef __VALIST
 #ifdef __GNUC__
@@ -281,42 +281,42 @@ __FILE *_EXFUN (_open_wmemstream_r, (struct _reent *, wchar_t **, size_t *));
 #endif
 
 #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int	_EXFUN(fwprintf, (__FILE *__restrict, const wchar_t *__restrict, ...));
-int	_EXFUN(swprintf, (wchar_t *__restrict, size_t,
-			const wchar_t *__restrict, ...));
-int	_EXFUN(vfwprintf, (__FILE *__restrict, const wchar_t *__restrict,
-			__VALIST));
-int	_EXFUN(vswprintf, (wchar_t *__restrict, size_t,
-			const wchar_t *__restrict, __VALIST));
-int	_EXFUN(vwprintf, (const wchar_t *__restrict, __VALIST));
-int	_EXFUN(wprintf, (const wchar_t *__restrict, ...));
-#endif
-
-int	_EXFUN(_fwprintf_r, (struct _reent *, __FILE *, const wchar_t *, ...));
-int	_EXFUN(_swprintf_r, (struct _reent *, wchar_t *, size_t, const wchar_t *, ...));
-int	_EXFUN(_vfwprintf_r, (struct _reent *, __FILE *, const wchar_t *, __VALIST));
-int	_EXFUN(_vswprintf_r, (struct _reent *, wchar_t *, size_t, const wchar_t *, __VALIST));
-int	_EXFUN(_vwprintf_r, (struct _reent *, const wchar_t *, __VALIST));
-int	_EXFUN(_wprintf_r, (struct _reent *, const wchar_t *, ...));
+int	fwprintf (__FILE *__restrict, const wchar_t *__restrict, ...);
+int	swprintf (wchar_t *__restrict, size_t,
+			const wchar_t *__restrict, ...);
+int	vfwprintf (__FILE *__restrict, const wchar_t *__restrict,
+			__VALIST);
+int	vswprintf (wchar_t *__restrict, size_t,
+			const wchar_t *__restrict, __VALIST);
+int	vwprintf (const wchar_t *__restrict, __VALIST);
+int	wprintf (const wchar_t *__restrict, ...);
+#endif
+
+int	_fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...);
+int	_swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...);
+int	_vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, __VALIST);
+int	_vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, __VALIST);
+int	_vwprintf_r (struct _reent *, const wchar_t *, __VALIST);
+int	_wprintf_r (struct _reent *, const wchar_t *, ...);
 
 #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int	_EXFUN(fwscanf, (__FILE *__restrict, const wchar_t *__restrict, ...));
-int	_EXFUN(swscanf, (const wchar_t *__restrict,
-			const wchar_t *__restrict, ...));
-int	_EXFUN(vfwscanf, (__FILE *__restrict, const wchar_t *__restrict,
-			__VALIST));
-int	_EXFUN(vswscanf, (const wchar_t *__restrict, const wchar_t *__restrict,
-			__VALIST));
-int	_EXFUN(vwscanf, (const wchar_t *__restrict, __VALIST));
-int	_EXFUN(wscanf, (const wchar_t *__restrict, ...));
-#endif
-
-int	_EXFUN(_fwscanf_r, (struct _reent *, __FILE *, const wchar_t *, ...));
-int	_EXFUN(_swscanf_r, (struct _reent *, const wchar_t *, const wchar_t *, ...));
-int	_EXFUN(_vfwscanf_r, (struct _reent *, __FILE *, const wchar_t *, __VALIST));
-int	_EXFUN(_vswscanf_r, (struct _reent *, const wchar_t *, const wchar_t *, __VALIST));
-int	_EXFUN(_vwscanf_r, (struct _reent *, const wchar_t *, __VALIST));
-int	_EXFUN(_wscanf_r, (struct _reent *, const wchar_t *, ...));
+int	fwscanf (__FILE *__restrict, const wchar_t *__restrict, ...);
+int	swscanf (const wchar_t *__restrict,
+			const wchar_t *__restrict, ...);
+int	vfwscanf (__FILE *__restrict, const wchar_t *__restrict,
+			__VALIST);
+int	vswscanf (const wchar_t *__restrict, const wchar_t *__restrict,
+			__VALIST);
+int	vwscanf (const wchar_t *__restrict, __VALIST);
+int	wscanf (const wchar_t *__restrict, ...);
+#endif
+
+int	_fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...);
+int	_swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...);
+int	_vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, __VALIST);
+int	_vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, __VALIST);
+int	_vwscanf_r (struct _reent *, const wchar_t *, __VALIST);
+int	_wscanf_r (struct _reent *, const wchar_t *, ...);
 
 #define getwc(fp)	fgetwc(fp)
 #define putwc(wc,fp)	fputwc((wc), (fp))