Redo "fix line number in macro redefined message"

Smaller change to fix more cases This reverts commit 0f36f60faa.
2016-05-25 18:51:36 +02:00
parent bab4519617
commit 9e0e05eb4e
2 changed files with 3 additions and 6 deletions
--- a/libtcc.c
+++ b/libtcc.c
@ -753,7 +753,7 @@ static void error1(TCCState *s1, int is_warning, const char *fmt, va_list ap)
                (*pf)->filename, (*pf)->line_num);
        if (f->line_num > 0) {
            strcat_printf(buf, sizeof(buf), "%s:%d: ",
-                f->filename, f->line_num);
+                f->filename, f->line_num - !!(tok_flags & TOK_FLAG_BOL));
        } else {
            strcat_printf(buf, sizeof(buf), "%s: ",
                f->filename);