diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cppmacro.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/paste12.c | 8 |
4 files changed, 19 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 29027a1..cfcc5fb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2002-05-24 Neil Booth <neil@daikokuya.demon.co.uk> + + PR preprocessor/6780 + * cppmacro.c (enter_macro_context): Clear state.angled_headers. + 2002-05-24 Jim Blandy <jimb@redhat.com> * dwarf2out.c (dwarf2out_finish): Don't forget to emit a final diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c index 40a9a07..d154c0c 100644 --- a/gcc/cppmacro.c +++ b/gcc/cppmacro.c @@ -660,6 +660,8 @@ enter_macro_context (pfile, node) /* The presence of a macro invalidates a file's controlling macro. */ pfile->mi_valid = false; + pfile->state.angled_headers = false; + /* Handle standard macros. */ if (! (node->flags & NODE_BUILTIN)) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ae26d86..deabe47 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2002-05-24 Neil Booth <neil@daikokuya.demon.co.uk> + + * gcc.dg/cpp/paste12.c: New test. + 2002-05-23 Neil Booth <neil@daikokuya.demon.co.uk> * g++.dg/parse/named_ops.C: New test. diff --git a/gcc/testsuite/gcc.dg/cpp/paste12.c b/gcc/testsuite/gcc.dg/cpp/paste12.c new file mode 100644 index 0000000..e61ec514 --- /dev/null +++ b/gcc/testsuite/gcc.dg/cpp/paste12.c @@ -0,0 +1,8 @@ +/* { dg-do preprocess } */ + +/* Test correct diagnostics when pasting in #include. + Source: PR preprocessor/6780. */ + +#define inc2(a,b) <##a.b> +#define INC(X) inc2(X,h) +#include INC(stdio) /* { dg-error "pasting \"<\" and \"stdio\" does not" } */ |