* haifa-sched.c (extend_global): Split to extend_global_data and

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

diff --git a/gcc/c-errors.c b/gcc/c-errors.c
index 274e9df..8adeeeb 100644 (file)
--- a/gcc/c-errors.c
+++ b/gcc/c-errors.c
@@ -1,12 +1,12 @@
 /* Various diagnostic subroutines for the GNU C language.
 /* Various diagnostic subroutines for the GNU C language.

-   Copyright (C) 2000, 2001, 2003 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 GCC.
 
 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
    Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
 
 This file is part of GCC.
 
 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 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,9 +15,8 @@ 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
 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, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #include "config.h"
 #include "system.h"
 
 #include "config.h"
 #include "system.h"


@@ -32,14 +31,15 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 /* Issue an ISO C99 pedantic warning MSGID.  */
 
 void
 /* Issue an ISO C99 pedantic warning MSGID.  */
 
 void

-pedwarn_c99 (const char *gmsgid, ...)
+pedwarn_c99 (int opt, const char *gmsgid, ...)

 {
   diagnostic_info diagnostic;
   va_list ap;
 {
   diagnostic_info diagnostic;
   va_list ap;

-  
+

   va_start (ap, gmsgid);
   diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location,
   va_start (ap, gmsgid);
   diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location,

-                       flag_isoc99 ? pedantic_error_kind () : DK_WARNING);
+                      flag_isoc99 ? pedantic_warning_kind () : DK_WARNING);
+  diagnostic.option_index = opt;

   report_diagnostic (&diagnostic);
   va_end (ap);
 }
   report_diagnostic (&diagnostic);
   va_end (ap);
 }


@@ -50,14 +50,15 @@ pedwarn_c99 (const char *gmsgid, ...)
    (There is no flag_c90.)  */
 
 void
    (There is no flag_c90.)  */
 
 void

-pedwarn_c90 (const char *gmsgid, ...)
+pedwarn_c90 (int opt, const char *gmsgid, ...)

 {
   diagnostic_info diagnostic;
   va_list ap;
 
   va_start (ap, gmsgid);
   diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location,
 {
   diagnostic_info diagnostic;
   va_list ap;
 
   va_start (ap, gmsgid);
   diagnostic_set_info (&diagnostic, gmsgid, &ap, input_location,

-                       flag_isoc99 ? DK_WARNING : pedantic_error_kind ());
+                      flag_isoc99 ? DK_WARNING : pedantic_warning_kind ());
+  diagnostic.option_index = opt;

   report_diagnostic (&diagnostic);
   va_end (ap);
 }
   report_diagnostic (&diagnostic);
   va_end (ap);
 }