From: Richard Kenner <kenner@gcc.gnu.org>
Date: Thu, 28 Sep 1995 18:29:40 +0000 (-0400)
Subject: (rescan): Expand `#if foo && #bar' without a bogus complaint about preprocessor direc... 
X-Git-Tag: misc/cutover-egcs-0~3552
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=823a28aa77fff51880e92db9473ae015a2128ab5;p=thirdparty%2Fgcc.git

(rescan): Expand `#if foo && #bar' without a bogus complaint about preprocessor directives within macro args.

(rescan): Expand `#if foo && #bar' without a bogus complaint about preprocessor
directives within macro args.
Expand `foo' in `foo#bar' without requiring a space before `#'.

From-SVN: r10412
---

diff --git a/gcc/cccp.c b/gcc/cccp.c
index 9ae8fd0ab0b7..64f5f757b40b 100644
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -2770,6 +2770,8 @@ do { ip = &instack[indepth];		\
 
     case '#':
       if (assertions_flag) {
+	if (ident_length)
+	  goto specialchar;
 	/* Copy #foo (bar lose) without macro expansion.  */
 	obp[-1] = '#';	/* In case it was '%'. */
 	SKIP_WHITE_SPACE (ibp);
@@ -2783,6 +2785,7 @@ do { ip = &instack[indepth];		\
 	  obp += ip->bufp - ibp;
 	  ibp = ip->bufp;
 	}
+	break;
       }
 
       /* If this is expanding a macro definition, don't recognize