diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2010-02-11 20:49:17 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2010-02-11 20:49:17 +0100 |
| commit | 709d7160dbfe86dd5d6a33e6680c2eb37e0b9119 (patch) | |
| tree | 04f5fc920c8aca51170d926c8e13fe8bd635fed4 /libcpp/init.c | |
| parent | a79ff094a98ab7ae3c02f07dabafadbe432248ac (diff) | |
| download | gcc-709d7160dbfe86dd5d6a33e6680c2eb37e0b9119.zip gcc-709d7160dbfe86dd5d6a33e6680c2eb37e0b9119.tar.gz gcc-709d7160dbfe86dd5d6a33e6680c2eb37e0b9119.tar.bz2 | |
init.c (read_original_filename): Don't call read_original_directory if _cpp_handle_directive returns 0.
* init.c (read_original_filename): Don't call read_original_directory
if _cpp_handle_directive returns 0.
From-SVN: r156720
Diffstat (limited to 'libcpp/init.c')
| -rw-r--r-- | libcpp/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcpp/init.c b/libcpp/init.c index 522ddbb..f5bf0ea 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -1,7 +1,7 @@ /* CPP Library. Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, - 2009 Free Software Foundation, Inc. + 2009, 2010 Free Software Foundation, Inc. Contributed by Per Bothner, 1994-95. Based on CCCP program by Paul Rubin, June 1986 Adapted to ANSI C, Richard Stallman, Jan 1987 @@ -595,9 +595,9 @@ read_original_filename (cpp_reader *pfile) pfile->state.in_directive = 0; /* If it's a #line directive, handle it. */ - if (token1->type == CPP_NUMBER) + if (token1->type == CPP_NUMBER + && _cpp_handle_directive (pfile, token->flags & PREV_WHITE)) { - _cpp_handle_directive (pfile, token->flags & PREV_WHITE); read_original_directory (pfile); return; } |