From 9334f9c6cd576128ec4fc891b5fcf267a7fca7fb Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Sun, 27 Mar 2005 05:28:42 +0000 Subject: merge from gcc --- libiberty/_doprnt.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'libiberty/_doprnt.c') diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c index 8ce1415..804b939 100644 --- a/libiberty/_doprnt.c +++ b/libiberty/_doprnt.c @@ -21,11 +21,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "safe-ctype.h" #include -#ifdef ANSI_PROTOTYPES #include -#else -#include -#endif #ifdef HAVE_STRING_H #include #endif @@ -79,10 +75,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ } while (0) int -_doprnt (format, ap, stream) - const char * format; - va_list ap; - FILE * stream; +_doprnt (const char *format, va_list ap, FILE *stream) { const char * ptr = format; char specifier[128]; @@ -223,10 +216,10 @@ _doprnt (format, ap, stream) fflush(stdin); \ } while (0) -static int checkit PARAMS ((const char * format, ...)) ATTRIBUTE_PRINTF_1; +static int checkit (const char * format, ...) ATTRIBUTE_PRINTF_1; static int -checkit VPARAMS ((const char* format, ...)) +checkit (const char* format, ...) { int result; VA_OPEN (args, format); @@ -239,7 +232,7 @@ checkit VPARAMS ((const char* format, ...)) } int -main () +main (void) { RESULT(checkit ("<%d>\n", 0x12345678)); RESULT(printf ("<%d>\n", 0x12345678)); -- cgit v1.1