Broken Tree

[Manuel López-Ibáñez]

2008/8/13 Sebastian Redl <sebastian.redl@getdesigned.at>:
> Hi,
>
> Checkin r139050 broke the build. In the file gcc/toplev.h, the new
> declaration pedwarn_at is incomplete, leading to syntax errors.
>
> Sebastian

Apologies, my fault. I messed up a conflict resolution.

Committed as obvious as revision 139054.

Index: gcc/toplev.h
===================================================================
--- gcc/toplev.h        (revision 139053)
+++ gcc/toplev.h        (revision 139054)
@@ -66,6 +66,7 @@
 /* Pass one of the OPT_W* from options.h as the first parameter.  */
 extern bool pedwarn (int, const char *, ...) ATTRIBUTE_GCC_DIAG(2,3);
 extern bool pedwarn_at (location_t, int, const char *, ...)
+     ATTRIBUTE_GCC_DIAG(3,4);
 extern bool permerror (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);
 extern bool permerror_at (location_t, const char *, ...)
      ATTRIBUTE_GCC_DIAG(2,3);
Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog       (revision 139053)
+++ gcc/ChangeLog       (revision 139054)
@@ -1,3 +1,7 @@
+2008-08-13  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+       * toplev.h (pedwarn_at): Fix declaration.
+