X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=gcc%2Ferrors.c;h=489f4b0f0ae243321dd5ba5cf28cbb554ec70e36;hb=0c6eef3096edafbcc857319efff2377dd63be7cb;hp=a1ccfeff43d2cf3e5e74d695f4acce4fc4658b64;hpb=71205d170c59ae70323aa7d0b93ff5c13044fd57;p=thirdparty%2Fgcc.git

diff --git a/gcc/errors.c b/gcc/errors.c
index a1ccfeff43d2..489f4b0f0ae2 100644
--- a/gcc/errors.c
+++ b/gcc/errors.c
@@ -1,6 +1,5 @@
 /* Basic error reporting routines.
-   Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -22,10 +21,11 @@ along with GCC; see the file COPYING3.  If not see
    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
+#ifdef HOST_GENERATOR_FILE
 #include "config.h"
+#define GENERATOR_FILE 1
+#else
+#include "bconfig.h"
 #endif
 #include "system.h"
 #include "errors.h"
@@ -40,8 +40,8 @@ int have_error = 0;
 
 /* Print a warning message - output produced, but there may be problems.  */
 
-bool
-warning (int opt ATTRIBUTE_UNUSED, const char *format, ...)
+void
+warning (const char *format, ...)
 {
   va_list ap;
 
@@ -49,8 +49,7 @@ warning (int opt ATTRIBUTE_UNUSED, const char *format, ...)
   fprintf (stderr, "%s: warning: ", progname);
   vfprintf (stderr, format, ap);
   va_end (ap);
-  fputc('\n', stderr);
-  return true;
+  fputc ('\n', stderr);
 }
 
 
@@ -65,7 +64,7 @@ error (const char *format, ...)
   fprintf (stderr, "%s: ", progname);
   vfprintf (stderr, format, ap);
   va_end (ap);
-  fputc('\n', stderr);
+  fputc ('\n', stderr);
 
   have_error = 1;
 }
@@ -82,7 +81,7 @@ fatal (const char *format, ...)
   fprintf (stderr, "%s: ", progname);
   vfprintf (stderr, format, ap);
   va_end (ap);
-  fputc('\n', stderr);
+  fputc ('\n', stderr);
   exit (FATAL_EXIT_CODE);
 }
 
@@ -105,7 +104,8 @@ internal_error (const char *format, ...)
    shares no directory elements with the pathname of __FILE__.  This
    is used by fancy_abort() to print `Internal compiler error in expr.c'
    instead of `Internal compiler error in ../../GCC/gcc/expr.c'.  This
-   version if for the gen* programs and so needn't handle subdirectories.  */
+   version is meant to be used for the gen* programs and therefor need not
+   handle subdirectories.  */
 
 const char *
 trim_filename (const char *name)