stdio.h fixes and a fix that fixes bullet

2 files changed, 161 insertions, 161 deletions

diff --git a/system/include/libc/stdio.h b/system/include/libc/stdio.h
index a92de046..fb4501c4 100644
--- a/system/include/libc/stdio.h
+++ b/system/include/libc/stdio.h
@@ -175,22 +175,22 @@ int	_EXFUN(fflush, (FILE *));
 FILE *	_EXFUN(freopen, (const char *, const char *, FILE *));
 void	_EXFUN(setbuf, (FILE *, char *));
 int	_EXFUN(setvbuf, (FILE *, char *, int, size_t));
-int	_EXFUN(fprintf, (FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int	_EXFUN(fscanf, (FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(printf, (const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
-int	_EXFUN(scanf, (const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 1, 2))));
-int	_EXFUN(sscanf, (const char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int	_EXFUN(vfprintf, (FILE *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(vprintf, (const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
-int	_EXFUN(vsprintf, (char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+int	_EXFUN(fprintf, (FILE *, const char *, ...));
+/* XXX Emscripten_ATTRIBUTE ((__format__ (__printf__, 2, 3)))); */
+int	_EXFUN(fscanf, (FILE *, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)))); */
+int	_EXFUN(printf, (const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 1, 2)))); */
+int	_EXFUN(scanf, (const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__scanf__, 1, 2)))); */
+int	_EXFUN(sscanf, (const char *, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__scanf__, 2, 3)))); */
+int	_EXFUN(vfprintf, (FILE *, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 2, 0)))); */
+int	_EXFUN(vprintf, (const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 1, 0)))); */
+int	_EXFUN(vsprintf, (char *, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 2, 0)))); */
 int	_EXFUN(fgetc, (FILE *));
 char *  _EXFUN(fgets, (char *, int, FILE *));
 int	_EXFUN(fputc, (int, FILE *));
@@ -223,8 +223,8 @@ int	_EXFUN(ferror, (FILE *));
 void    _EXFUN(perror, (const char *));
 #ifndef _REENT_ONLY
 FILE *	_EXFUN(fopen, (const char *_name, const char *_type));
-int	_EXFUN(sprintf, (char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+int	_EXFUN(sprintf, (char *, const char *, ...));
+/* XXX EMSCRIPTEN _ATTRIBUTE ((__format__ (__printf__, 2, 3)))); */
 int	_EXFUN(remove, (const char *));
 int	_EXFUN(rename, (const char *, const char *));
 #endif
@@ -239,68 +239,68 @@ off_t	_EXFUN(ftello, ( FILE *));
 #endif
 #if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L)
 #ifndef _REENT_ONLY
-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 *, size_t *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(asprintf, (char **, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+int	_EXFUN(asiprintf, (char **, const char *, ...));
+/* XXX EMSCRIPTEN _ATTRIBUTE ((__format__ (__printf__, 2, 3)))); */
+char *	_EXFUN(asniprintf, (char *, size_t *, const char *, ...));
+/*                _ATTRIBUTE ((__format__ (__printf__, 3, 4)))); */
+char *	_EXFUN(asnprintf, (char *, size_t *, const char *, ...));
+/*                _ATTRIBUTE ((__format__ (__printf__, 3, 4)))); */
+int	_EXFUN(asprintf, (char **, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 2, 3)))); */
 #ifndef diprintf
-int	_EXFUN(diprintf, (int, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+int	_EXFUN(diprintf, (int, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 2, 3)))); */
 #endif
 int	_EXFUN(fcloseall, (_VOID));
-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(snprintf, (char *, size_t, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(sniprintf, (char *, size_t, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
+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(snprintf, (char *, size_t, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 3, 4)))); */
+int	_EXFUN(sniprintf, (char *, size_t, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 3, 4)))); */
 char *	_EXFUN(tempnam, (const char *, const char *));
-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(vasprintf, (char **, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 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(vfscanf, (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(vscanf, (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	_EXFUN(vsnprintf, (char *, size_t, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(vsscanf, (const char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
+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(vasprintf, (char **, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 2, 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(vfscanf, (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(vscanf, (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	_EXFUN(vsnprintf, (char *, size_t, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 3, 0)))); */
+int	_EXFUN(vsscanf, (const char *, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__scanf__, 2, 0)))); */
 #endif /* !_REENT_ONLY */
 #endif /* !__STRICT_ANSI__ */
 
@@ -335,8 +335,8 @@ int	_EXFUN(putchar_unlocked, (int));
 #ifndef __STRICT_ANSI__
 # ifndef _REENT_ONLY
 #  ifndef dprintf
-int	_EXFUN(dprintf, (int, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+int	_EXFUN(dprintf, (int, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 2, 3)))); */
 #  endif
 FILE *	_EXFUN(fmemopen, (void *, size_t, const char *));
 /* getdelim - see __getdelim for now */
@@ -345,8 +345,8 @@ FILE *	_EXFUN(open_memstream, (char **, size_t *));
 #if defined (__CYGWIN__)
 int	_EXFUN(renameat, (int, const char *, int, const char *));
 #endif
-int	_EXFUN(vdprintf, (int, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+int	_EXFUN(vdprintf, (int, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 2, 0)))); */
 # endif
 #endif
 
@@ -354,18 +354,18 @@ int	_EXFUN(vdprintf, (int, const char *, __VALIST)
  * 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 *, size_t *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int	_EXFUN(_asprintf_r, (struct _reent *, char **, const char *, ...)
-               _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 *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
+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 *, size_t *, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 4, 5)))); */
+int	_EXFUN(_asprintf_r, (struct _reent *, char **, const char *, ...));
+/*               _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 *, ...));
+/*               _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 *));
@@ -379,21 +379,21 @@ int	_EXFUN(_fsetpos_r, (struct _reent *, FILE *, const _fpos_t *));
 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))));
+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 *, size_t, const char *));
 FILE *	_EXFUN(_fopen_r, (struct _reent *, const char *, const char *));
 FILE *	_EXFUN(_freopen_r, (struct _reent *, const char *, const char *, FILE *));
-int	_EXFUN(_fprintf_r, (struct _reent *, FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
+int	_EXFUN(_fprintf_r, (struct _reent *, FILE *, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 3, 4)))); */
 int	_EXFUN(_fpurge_r, (struct _reent *, FILE *));
 int	_EXFUN(_fputc_r, (struct _reent *, int, FILE *));
 int	_EXFUN(_fputs_r, (struct _reent *, const char *, FILE *));
 size_t	_EXFUN(_fread_r, (struct _reent *, _PTR, size_t _size, size_t _n, FILE *));
-int	_EXFUN(_fscanf_r, (struct _reent *, FILE *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
+int	_EXFUN(_fscanf_r, (struct _reent *, FILE *, const char *, ...));
+/*               _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 *));
@@ -405,14 +405,14 @@ 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))));
+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 *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+int	_EXFUN(_printf_r, (struct _reent *, const char *, ...));
+/*               _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));
@@ -421,64 +421,64 @@ 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 *, ...)
-               _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 *, size_t, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int	_EXFUN(_sprintf_r, (struct _reent *, char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int	_EXFUN(_sscanf_r, (struct _reent *, const char *, const char *, ...)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
+int	_EXFUN(_scanf_r, (struct _reent *, const char *, ...));
+/*               _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 *, size_t, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 4, 5)))); */
+int	_EXFUN(_sprintf_r, (struct _reent *, char *, const char *, ...));
+/*               _ATTRIBUTE ((__format__ (__printf__, 3, 4)))); */
+int	_EXFUN(_sscanf_r, (struct _reent *, const char *, const char *, ...));
+/*               _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 *, __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 *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vfscanf_r, (struct _reent *, FILE *, const char *, __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 *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int	_EXFUN(_vscanf_r, (struct _reent *, const char *, __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 *, size_t, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int	_EXFUN(_vsprintf_r, (struct _reent *, char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	_EXFUN(_vsscanf_r, (struct _reent *, const char *, const char *, __VALIST)
-               _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
+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 *, __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 *, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 3, 0)))); */
+int	_EXFUN(_vfscanf_r, (struct _reent *, FILE *, const char *, __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 *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 2, 0)))); */
+int	_EXFUN(_vscanf_r, (struct _reent *, const char *, __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 *, size_t, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 4, 0)))); */
+int	_EXFUN(_vsprintf_r, (struct _reent *, char *, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__printf__, 3, 0)))); */
+int	_EXFUN(_vsscanf_r, (struct _reent *, const char *, const char *, __VALIST));
+/*               _ATTRIBUTE ((__format__ (__scanf__, 3, 0)))); */
 
 /* Other extensions.  */
 
diff --git a/tests/bullet/Makefile.in b/tests/bullet/Makefile.in
index ae734464..95aca938 100644
--- a/tests/bullet/Makefile.in
+++ b/tests/bullet/Makefile.in
@@ -232,7 +232,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
+	# XXX Emscripten $(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)