PR preprocessor/30805:

[pf3gnuchains/gcc-fork.git] / gcc / c-errors.c

diff --git a/gcc/c-errors.c b/gcc/c-errors.c
index a553d29..c85d397 100644 (file)
--- a/gcc/c-errors.c
+++ b/gcc/c-errors.c
@@ -1,26 +1,27 @@
 /* Various diagnostic subroutines for the GNU C language.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2003, 2007 Free Software Foundation, Inc.
    Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
 #include "c-tree.h"
 #include "tm_p.h"
@@ -30,19 +31,32 @@ Boston, MA 02111-1307, USA.  */
 /* Issue an ISO C99 pedantic warning MSGID.  */
 
 void
-pedwarn_c99 VPARAMS ((const char *msgid, ...))
+pedwarn_c99 (const char *gmsgid, ...)
 {
-#ifndef ANSI_PROTOTYPES
-  const char *msgid;
-#endif
+  diagnostic_info diagnostic;
   va_list ap;
 
-  VA_START (ap, msgid);
+  va_start (ap, gmsgid);
+  diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location,
+                      flag_isoc99 ? pedantic_error_kind () : DK_WARNING);
+  report_diagnostic (&diagnostic);
+  va_end (ap);
+}
+
+/* Issue an ISO C90 pedantic warning MSGID.  This function is supposed to
+   be used for matters that are allowed in ISO C99 but not supported in
+   ISO C90, thus we explicitly don't pedwarn when C99 is specified.
+   (There is no flag_c90.)  */
 
-#ifndef ANSI_PROTOTYPES
-  msgid = va_arg (ap, const char *);
-#endif
+void
+pedwarn_c90 (const char *gmsgid, ...)
+{
+  diagnostic_info diagnostic;
+  va_list ap;
 
-  report_diagnostic (msgid, ap, input_filename, lineno,
-                     !flag_isoc99 || !flag_pedantic_errors);
+  va_start (ap, gmsgid);
+  diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location,
+                      flag_isoc99 ? DK_WARNING : pedantic_error_kind ());
+  report_diagnostic (&diagnostic);
+  va_end (ap);
 }