summaryrefslogtreecommitdiff
path: root/libcpp/init.c
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2010-02-11 19:49:17 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2010-02-11 19:49:17 +0000
commit65f4061555f49111e136ee4cbbbaa1f07a46b6f6 (patch)
tree04f5fc920c8aca51170d926c8e13fe8bd635fed4 /libcpp/init.c
parent1fb1e0c8e3a69fac556da924719eefb0ad7836cb (diff)
downloadgcc-65f4061555f49111e136ee4cbbbaa1f07a46b6f6.tar.gz
* init.c (read_original_filename): Don't call read_original_directory
if _cpp_handle_directive returns 0. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156720 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp/init.c')
-rw-r--r--libcpp/init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcpp/init.c b/libcpp/init.c
index 522ddbbb638..f5bf0ea7b7d 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;
}