From a57180adeadd32d16be6944a3380046dcc3630f8 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 27 Jan 1994 21:50:46 +0000 Subject: [PATCH] * messages.c (as_warn_internal): New static function. (as_warn, 3 versions): Use as_warn_internal. (as_warn_where, 3 versions): New function. * as.h (as_warn_where): Declare. --- gas/ChangeLog | 7 +++++++ gas/as.h | 19 ++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index c7e60f268b0..a06abfc9280 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +Thu Jan 27 16:43:51 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * messages.c (as_warn_internal): New static function. + (as_warn, 3 versions): Use as_warn_internal. + (as_warn_where, 3 versions): New function. + * as.h (as_warn_where): Declare. + Tue Jan 25 18:30:34 1994 Stan Shebs (shebs@andros.cygnus.com) * as.c (quiet_flag): New flag. diff --git a/gas/as.h b/gas/as.h index e9a012e12ce..0deb6004004 100644 --- a/gas/as.h +++ b/gas/as.h @@ -371,28 +371,25 @@ typedef struct lineno_struct lineno; /* for use with -Wformat */ #define PRINTF_LIKE(FCN) void FCN (const char *format, ...) \ __attribute__ ((format (printf, 1, 2))) +#define PRINTF_WHERE_LIKE(FCN) void FCN (char *file, unsigned int line, \ + const char *format, ...) \ + __attribute__ ((format (printf, 3, 4))) #else /* ANSI C with stdarg, but not GNU C */ #define PRINTF_LIKE(FCN) void FCN (const char *format, ...) +#define PRINTF_WHERE_LIKE(FCN) void FCN (char *file, unsigned int line, \ + const char *format, ...) #endif #else /* not ANSI C, or not stdarg */ #define PRINTF_LIKE(FCN) void FCN () +#define PRINTF_WHERE_LIKE(FCN) void FCN () #endif PRINTF_LIKE (as_bad); PRINTF_LIKE (as_fatal); PRINTF_LIKE (as_tsktsk); PRINTF_LIKE (as_warn); - -#if defined (__STDC__) && !defined (NO_STDARG) -#if __GNUC__ >= 2 -void as_bad_where (char *file, unsigned int line, const char *format, ...) - __attribute__ ((format (printf, 3, 4))); -#else /* ANSI C with stdarg, but not GNU C */ -void as_bad_where (char *file, unsigned int line, const char *format, ...); -#endif -#else /* not ANSI C, or not stdarg */ -void as_bad_where (); -#endif +PRINTF_WHERE_LIKE (as_bad_where); +PRINTF_WHERE_LIKE (as_warn_where); void fprint_value PARAMS ((FILE *file, addressT value)); void sprint_value PARAMS ((char *buf, addressT value)); -- 2.30.2