diff -ru _/minix/include/stdio.h minix/include/stdio.h --- _/minix/include/stdio.h 2005-09-01 22:07:08.000000000 +0900 +++ minix/include/stdio.h 2009-11-11 00:00:00.000000000 +0900 @@ -60,7 +60,11 @@ #define TMP_MAX 999 #define L_tmpnam (sizeof("/tmp/") + FILENAME_MAX) +#if 0 #define __STDIO_VA_LIST__ void * +#else /* patch */ +#include +#endif typedef long int fpos_t; @@ -87,17 +91,30 @@ _PROTOTYPE( int fprintf, (FILE *_stream, const char *_format, ...) ); _PROTOTYPE( int printf, (const char *_format, ...) ); _PROTOTYPE( int sprintf, (char *_s, const char *_format, ...) ); +#if 0 _PROTOTYPE( int vfprintf, (FILE *_stream, const char *_format, char *_arg) ); _PROTOTYPE( int vprintf, (const char *_format, char *_arg) ); _PROTOTYPE( int vsprintf, (char *_s, const char *_format, char *_arg) ); +#else /* patch */ +_PROTOTYPE( int vfprintf, + (FILE *_stream, const char *_format, va_list _arg) ); +_PROTOTYPE( int vprintf, (const char *_format, va_list _arg) ); +_PROTOTYPE( int vsprintf, (char *_s, const char *_format, va_list _arg) ); +#endif _PROTOTYPE( int fscanf, (FILE *_stream, const char *_format, ...) ); _PROTOTYPE( int scanf, (const char *_format, ...) ); _PROTOTYPE( int sscanf, (const char *_s, const char *_format, ...) ); #define vfscanf _doscan +#if 0 _PROTOTYPE( int vfscanf, (FILE *_stream, const char *_format, char *_arg)); _PROTOTYPE( int vscanf, (const char *_format, char *_arg) ); _PROTOTYPE( int vsscanf, (const char *_s, const char *_format, char *_arg)); +#else /* patch */ +_PROTOTYPE( int vfscanf, (FILE *_stream, const char *_format, va_list _arg)); +_PROTOTYPE( int vscanf, (const char *_format, va_list _arg) ); +_PROTOTYPE( int vsscanf, (const char *_s, const char *_format, va_list _arg)); +#endif _PROTOTYPE( int fgetc, (FILE *_stream) ); _PROTOTYPE( char *fgets, (char *_s, int _n, FILE *_stream) ); _PROTOTYPE( int fputc, (int _c, FILE *_stream) ); @@ -149,8 +166,13 @@ _PROTOTYPE(FILE *popen, (const char *_command, const char *_type)); _PROTOTYPE(int pclose, (FILE *_stream)); _PROTOTYPE(int snprintf, (char *_s, size_t _n, const char *_format, ...)); +#if 0 _PROTOTYPE(int vsnprintf, (char *_s, size_t _n, const char *_format, char *_arg) ); +#else /* patch */ +_PROTOTYPE(int vsnprintf, (char *_s, size_t _n, const char *_format, + va_list _arg) ); +#endif #endif #endif /* _STDIO_H */