directives.c (parse_include): Pass true to check_eol.

libcpp: * directives.c (parse_include): Pass true to check_eol. gcc/testsuite: * gcc.dg/cpp/include5.c: New test. From-SVN: r146327

directives.c (parse_include): Pass true to check_eol.
libcpp: * directives.c (parse_include): Pass true to check_eol. gcc/testsuite: * gcc.dg/cpp/include5.c: New test. From-SVN: r146327
61cc8223 · Joseph Myers · Joseph Myers · 149ccdd4 · 61cc8223 · 61cc8223
Commit 61cc8223 authored Apr 18, 2009 by Joseph Myers Committed by Joseph Myers Apr 18, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 1 deletions

gcc/testsuite/ChangeLog
+4 -0

gcc/testsuite/gcc.dg/cpp/include5.c
+9 -0

libcpp/ChangeLog
+4 -0

libcpp/directives.c
+1 -1

No files found.
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
 2009-04-18  Joseph Myers  <joseph@codesourcery.com>

+	* gcc.dg/cpp/include5.c: New test.
+
+2009-04-18  Joseph Myers  <joseph@codesourcery.com>
+
 	PR c/35210
 	* gcc.dg/call-diag-2.c: New test.


--- a/gcc/testsuite/gcc.dg/cpp/include5.c
+++ b/gcc/testsuite/gcc.dg/cpp/include5.c
+/* Test #include directives with macros expanding to empty.  */
+
+#define EMPTY_OBJ
+#define EMPTY_FUNC()
+
+#include <stddef.h> EMPTY_OBJ
+#include <stddef.h> EMPTY_FUNC()
+#include "stddef.h" EMPTY_OBJ
+#include "stddef.h" EMPTY_FUNC()
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
 2009-04-18  Joseph Myers  <joseph@codesourcery.com>

+	* directives.c (parse_include): Pass true to check_eol.
+
+2009-04-18  Joseph Myers  <joseph@codesourcery.com>
+
 	PR preprocessor/39646
 	* include/line-map.h (enum lc_reason): Add LC_RENAME_VERBATIM.
 	* line-map.c (linemap_add): Handle LC_RENAME_VERBATIM.

--- a/libcpp/directives.c
+++ b/libcpp/directives.c
@@ -724,7 +724,7 @@ parse_include (cpp_reader *pfile, int *pangle_brackets,
      /* This pragma allows extra tokens after the file name.  */
    }
  else if (buf == NULL || CPP_OPTION (pfile, discard_comments))
-    check_eol (pfile, false);
+    check_eol (pfile, true);
  else
    {
      /* If we are not discarding comments, then gather them while