From c2e205420935c7d696a7c733f941e8131de2b912 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Fri, 25 Aug 2000 07:04:59 +0000 Subject: [PATCH] cpplex.c (is_macro_disabled): Caller has already checked that we're not a preprocessed file. * cpplex.c (is_macro_disabled): Caller has already checked that we're not a preprocessed file. From-SVN: r35970 --- gcc/ChangeLog | 5 +++++ gcc/cpplex.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 305e174478e..93753103c7f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Fri 25-Aug-2000 08:03:27 BST Neil Booth + + * cpplex.c (is_macro_disabled): Caller has already checked + that we're not a preprocessed file. + 2000-08-24 Mark Mitchell * Makefile.in (C_AND_OBJC_OBJS): Remove c-iterate.o. diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 779bcf0d60b..c5855266785 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 -- 2.30.2