aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/cpp/include5.c9
-rw-r--r--libcpp/ChangeLog4
-rw-r--r--libcpp/directives.c2
4 files changed, 18 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 16197bc6e83..0ccc20a2246 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
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.
diff --git a/gcc/testsuite/gcc.dg/cpp/include5.c b/gcc/testsuite/gcc.dg/cpp/include5.c
new file mode 100644
index 00000000000..9bbc2878d05
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/include5.c
@@ -0,0 +1,9 @@
+/* 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()
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index ab72fa61061..c4316caa334 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,5 +1,9 @@
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.
diff --git a/libcpp/directives.c b/libcpp/directives.c
index 9e26732337b..c2e71016f24 100644
--- 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