From b0f4807f9eaf796932e18525178bbd630bb5c8ed Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Fri, 16 Nov 2007 13:46:57 +0000 Subject: [PATCH] * files.c (search_path_head): Fix check for absolute paths. From-SVN: r130229 --- libcpp/ChangeLog | 4 ++++ libcpp/files.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * files.c (search_path_head): Fix check for absolute paths. + 2007-11-05 Tom Tromey * 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; -- 2.30.2