diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cpplib.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index be99a12..553f6b2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 22 12:04:58 1999 Jason Merrill <jason@yorick.cygnus.com> + + * cpplib.c (handle_directive): Don't complain about `# NUMBER' if + we're seeing this input for a second time. + Thu Sep 23 12:59:14 1999 Alex Samuel <samuel@codesourcery.com> Richard Henderson <rth@cygnus.com> diff --git a/gcc/cpplib.c b/gcc/cpplib.c index b315186..80f02de 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -528,8 +528,12 @@ handle_directive (pfile) c = PEEKC (); if (c >= '0' && c <= '9') { - /* Handle # followed by a line number. */ - if (CPP_PEDANTIC (pfile)) + /* Handle # followed by a line number. Complain about using that + form if we're being pedantic, but not if this is regurgitated + input (preprocessed or fed back in by the C++ frontend). */ + if (CPP_PEDANTIC (pfile) + && ! CPP_PREPROCESSED (pfile) + && ! CPP_BUFFER (pfile)->manual_pop) cpp_pedwarn (pfile, "`#' followed by integer"); do_line (pfile, NULL); return 1; |