* decl2.c: Include "timevar.h".

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

diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index 3e6b37c..20d8c8c 100644 (file)
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -25,6 +25,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "cpplib.h"
 #include "cpphash.h"
 #include "intl.h"
@@ -92,6 +94,7 @@ _cpp_begin_message (pfile, code, line, column)
        {
          if (CPP_OPTION (pfile, inhibit_errors))
            return 0;
+         level = DL_ERROR;
          pfile->errors++;
        }
       else if (CPP_OPTION (pfile, inhibit_warnings))
@@ -136,8 +139,19 @@ cpp_error VPARAMS ((cpp_reader * pfile, int level, const char *msgid, ...))
 
   if (pfile->buffer)
     {
-      line = pfile->cur_token[-1].line;
-      column = pfile->cur_token[-1].col;
+      if (CPP_OPTION (pfile, traditional))
+       {
+         if (pfile->state.in_directive)
+           line = pfile->directive_line;
+         else
+           line = pfile->line;
+         column = 0;
+       }
+      else
+       {
+         line = pfile->cur_token[-1].line;
+         column = pfile->cur_token[-1].col;
+       }
     }
   else
     line = column = 0;