aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cpplex.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 305e174..9375310 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri 25-Aug-2000 08:03:27 BST Neil Booth <NeilB@earthling.net>
+
+ * cpplex.c (is_macro_disabled): Caller has already checked
+ that we're not a preprocessed file.
+
2000-08-24 Mark Mitchell <mark@codesourcery.com>
* Makefile.in (C_AND_OBJC_OBJS): Remove c-iterate.o.
diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 779bcf0..c585526 100644
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -2224,10 +2224,6 @@ is_macro_disabled (pfile, expansion, token)
{
cpp_context *context = CURRENT_CONTEXT (pfile);
- /* Don't expand anything if this file has already been preprocessed. */
- if (CPP_OPTION (pfile, preprocessed))
- return 1;
-
/* Arguments on either side of ## are inserted in place without
macro expansion (6.10.3.3.2). Conceptually, any macro expansion
occurs during a later rescan pass. The effect is that we expand