diff options
| author | Per Bothner <per@bothner.com> | 2004-07-14 17:02:30 -0700 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-07-14 17:02:30 -0700 |
| commit | aa3c6dc1604edf2119da7cf6d39c6afab3a676d7 (patch) | |
| tree | 590981ecbc489c808f0c696cd08606defbd93ffa /gcc/gengtype-lex.l | |
| parent | 368b7a304e674df0e140b6dc164e670650c56486 (diff) | |
input.h: If USE_MAPPED_LOCATION...
* input.h: If USE_MAPPED_LOCATION, define separate expanded_location
structure with extra column field.
* tree.c (expand_location): Also fill in column field.
* gengtype-lex.l: Ignore expanded_location typedef, sinze gengtype
gets confused by the two conditionally-compiled definitions.
From-SVN: r84721
Diffstat (limited to 'gcc/gengtype-lex.l')
| -rw-r--r-- | gcc/gengtype-lex.l | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l index 22a5cd8ee0f..60b738eadce 100644 --- 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 */ - 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); |