aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cpplex.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aef2b93..ff755ef 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2000-11-04 Neil Booth <neilb@earthling.net>
+ * cpplex.c (parse_string): Don't allow multiline strings in
+ #include family directives.
+
+2000-11-04 Neil Booth <neilb@earthling.net>
+
* cpplib.c (do_line): Only warn pedantically if not reading
preprocessed input.
diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 68ceb36..86dbf5a 100644
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -675,8 +675,8 @@ parse_string (pfile, token, terminator)
/* Character constants and header names may not extend over
multiple lines. In Standard C, neither may strings.
Unfortunately, we accept multiline strings as an
- extension. */
- if (terminator != '"')
+ extension, except in #include family directives. */
+ if (terminator != '"' || pfile->state.angled_headers)
{
unterminated (pfile, terminator);
break;