diff options
| author | matz <> | 2007-11-16 13:46:57 +0000 |
|---|---|---|
| committer | matz <> | 2007-11-16 13:46:57 +0000 |
| commit | 59b2adce9033f792fdecbceed702f76b11f98c8c (patch) | |
| tree | e93b5bc6866b38236bebc566953efb5809d0d299 /libcpp | |
| parent | 5541cd5c4f1e2e62c6afb846759f1a809743335d (diff) | |
* files.c (search_path_head): Fix check for absolute paths.
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 4 | ||||
| -rw-r--r-- | libcpp/files.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 475d4f6f184..9333b8c6f38 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -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 diff --git a/libcpp/files.c b/libcpp/files.c index ae2f2945d9e..ad7dad03afa 100644 --- a/libcpp/files.c +++ b/libcpp/files.c @@ -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; |