summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cpperror.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bddf1ec4bcf..2d200c0f4aa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-17 Neil Booth <neilb@earthling.net>
+
+ * cpperror.c (print_file_and_line): Don't display line number
+ if 0.
+
2000-11-17 Zack Weinberg <zack@wolery.stanford.edu>
* ggc.h: Delete ggc_add_string_root and ggc_mark_string. Add
diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index d598fbd78a4..ff83c6fb87b 100644
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -86,19 +86,19 @@ print_containing_files (pfile, ip)
}
static void
-print_file_and_line (filename, line, column)
+print_file_and_line (filename, line, col)
const char *filename;
- unsigned int line, column;
+ unsigned int line, col;
{
if (filename == 0 || *filename == '\0')
filename = "<stdin>";
- if (line == (unsigned int)-1)
+ if (line == 0)
fprintf (stderr, "%s: ", filename);
- else if (column > 0)
- fprintf (stderr, "%s:%u:%u: ", filename, line, column);
- else
+ else if (col == 0)
fprintf (stderr, "%s:%u: ", filename, line);
+ else
+ fprintf (stderr, "%s:%u:%u: ", filename, line, col);
}
/* Set up for an error message: print the file and line, bump the error