OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* files.c (search_path_head): Fix check for absolute paths. 

From-SVN: r130229
This commit is contained in:
Michael Matz 2007-11-16 13:46:57 +00:00 committed by Michael Matz
parent 237b2f1b41
commit b0f4807f9e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcpp/ChangeLog
View File

@ -1,3 +1,7 @@
2007-11-16 Michael Matz <matz@suse.de>
* files.c (search_path_head): Fix check for absolute paths.
2007-11-05 Tom Tromey <tromey@redhat.com>
* include/line-map.h (LINEMAP_POSITION_FOR_COLUMN): Wrap in

3
libcpp/files.c
View File

@ -837,7 +837,8 @@ search_path_head (cpp_reader *pfile, const char *fname, int angle_brackets,
/* For #include_next, skip in the search path past the dir in which
the current file was found, but if it was found via an absolute
path use the normal search logic. */
if (type == IT_INCLUDE_NEXT && file->dir)
if (type == IT_INCLUDE_NEXT && file->dir
&& file->dir != &pfile->no_search_path)
dir = file->dir->next;
else if (angle_brackets)
dir = pfile->bracket_include;