Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 73834
Collapse All | Expand All

(-)gcc-3.4.3/gcc/cppmacro.c (-4 / +8 lines)
Lines 1626-1631 Link Here
1626
	len += NODE_LEN (macro->params[i]) + 1; /* "," */
1626
	len += NODE_LEN (macro->params[i]) + 1; /* "," */
1627
    }
1627
    }
1628
1628
1629
  /* This should match below where we fill in the buffer.  */
1629
  if (CPP_OPTION (pfile, traditional))
1630
  if (CPP_OPTION (pfile, traditional))
1630
    len += _cpp_replacement_text_len (macro);
1631
    len += _cpp_replacement_text_len (macro);
1631
  else
1632
  else
Lines 1637-1647 Link Here
1637
	  if (token->type == CPP_MACRO_ARG)
1638
	  if (token->type == CPP_MACRO_ARG)
1638
	    len += NODE_LEN (macro->params[token->val.arg_no - 1]);
1639
	    len += NODE_LEN (macro->params[token->val.arg_no - 1]);
1639
	  else
1640
	  else
1640
	    len += cpp_token_len (token) + 1; /* Includes room for ' '.  */
1641
	    len += cpp_token_len (token);
1642
	    
1641
	  if (token->flags & STRINGIFY_ARG)
1643
	  if (token->flags & STRINGIFY_ARG)
1642
	    len++;			/* "#" */
1644
	    len++;			/* "#" */
1643
	  if (token->flags & PASTE_LEFT)
1645
	  if (token->flags & PASTE_LEFT)
1644
	    len += 3;		/* " ##" */
1646
	    len += 3;		/* " ##" */
1647
	  if (token->flags & PREV_WHITE)
1648
	    len++;              /* " " */
1645
	}
1649
	}
1646
    }
1650
    }
1647
1651
Lines 1701-1710 Link Here
1701
1705
1702
	  if (token->type == CPP_MACRO_ARG)
1706
	  if (token->type == CPP_MACRO_ARG)
1703
	    {
1707
	    {
1704
	      len = NODE_LEN (macro->params[token->val.arg_no - 1]);
1705
	      memcpy (buffer,
1708
	      memcpy (buffer,
1706
		      NODE_NAME (macro->params[token->val.arg_no - 1]), len);
1709
		      NODE_NAME (macro->params[token->val.arg_no - 1]),
1707
	      buffer += len;
1710
		      NODE_LEN (macro->params[token->val.arg_no - 1]));
1711
	      buffer += NODE_LEN (macro->params[token->val.arg_no - 1]);
1708
	    }
1712
	    }
1709
	  else
1713
	  else
1710
	    buffer = cpp_spell_token (pfile, token, buffer);
1714
	    buffer = cpp_spell_token (pfile, token, buffer);

Return to bug 73834