* input.h: If USE_MAPPED_LOCATION, define separate expanded_location

[pf3gnuchains/gcc-fork.git] / gcc / gengtype-lex.l

diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index 22a5cd8..60b738e 100644 (file)
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -91,7 +91,8 @@ ITYPE {IWORD}({WS}{IWORD})*
   namestart = xmemdup (namestart, namelen, namelen+1);
 #ifdef USE_MAPPED_LOCATION
   /* temporary kludge - gentype doesn't handle cpp conditionals */
   namestart = xmemdup (namestart, namelen, namelen+1);
 #ifdef USE_MAPPED_LOCATION
   /* temporary kludge - gentype doesn't handle cpp conditionals */

-  if (strcmp (namestart, "location_t") != 0)
+  if (strcmp (namestart, "location_t") != 0
+      && strcmp (namestart, "expanded_location") != 0)

 #endif
   do_typedef (namestart, t, &lexer_line);
   update_lineno (yytext, yyleng);
 #endif
   do_typedef (namestart, t, &lexer_line);
   update_lineno (yytext, yyleng);