summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cppmacro.c14
2 files changed, 10 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 28ff4d9ffa0..e46af0e68de 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-11 Neil Booth <neil@daikokuya.demon.co.uk>
+
+ * cppmacro.c (enter_macro_context): Push macro expansions even
+ if empty.
+
2001-08-11 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* config/rs6000/rs6000.c: Include integrate.h to silence warning.
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 8eb67e1d3a3..09cad20553c 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -669,16 +669,12 @@ enter_macro_context (pfile, node)
list.limit = macro->expansion + macro->count;
}
- /* Only push a macro context for non-empty replacement lists. */
- if (list.first != list.limit)
- {
- context = next_context (pfile);
- context->list = list;
- context->macro = macro;
+ context = next_context (pfile);
+ context->list = list;
+ context->macro = macro;
- /* Disable the macro within its expansion. */
- macro->disabled = 1;
- }
+ /* Disable the macro within its expansion. */
+ macro->disabled = 1;
return 1;
}