diff options
Diffstat (limited to 'contrib/gcc/errors.c')
| -rw-r--r-- | contrib/gcc/errors.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/contrib/gcc/errors.c b/contrib/gcc/errors.c index 09504d3..ab5e2a8 100644 --- a/contrib/gcc/errors.c +++ b/contrib/gcc/errors.c @@ -1,5 +1,5 @@ /* Basic error reporting routines. - Copyright (C) 1999, 2000, 2001, 2003 + Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GCC. @@ -16,14 +16,18 @@ for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ /* warning, error, and fatal. These definitions are suitable for use - in the generator programs; eventually we would like to use them in - cc1 too, but that's a longer term project. */ + in the generator programs; the compiler has a more elaborate suite + of diagnostic printers, found in diagnostic.c. */ +#ifdef GENERATOR_FILE +#include "bconfig.h" +#else #include "config.h" +#endif #include "system.h" #include "errors.h" @@ -38,7 +42,7 @@ int have_error = 0; /* Print a warning message - output produced, but there may be problems. */ void -warning (const char *format, ...) +warning (int opt ATTRIBUTE_UNUSED, const char *format, ...) { va_list ap; @@ -126,5 +130,5 @@ trim_filename (const char *name) void fancy_abort (const char *file, int line, const char *func) { - internal_error ("abort in %s, at %s:%d", func, file, line); + internal_error ("abort in %s, at %s:%d", func, trim_filename (file), line); } |
