diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-20 10:30:47 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-20 10:30:47 +0000 |
| commit | 72ac7d9ad7ef5247230b575be3873871826b5394 (patch) | |
| tree | 8af78e78eba41a5b221046c007374ccdf5da9eb8 /gcc/cppinit.c | |
| parent | 837a4fbadd76a41e56cf4ad4e6aede351c4938a0 (diff) | |
| download | gcc-72ac7d9ad7ef5247230b575be3873871826b5394.tar.gz | |
* cppinit.c (remove_dup_dir): Make static.
(remove_dup_dirs): Make static. Only warn about preempting a
system directory with a non-system directory.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44188 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cppinit.c')
| -rw-r--r-- | gcc/cppinit.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c index 5ac676a5c0b..0aac625f84c 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -100,9 +100,9 @@ static void init_library PARAMS ((void)); static void init_builtins PARAMS ((cpp_reader *)); static void append_include_chain PARAMS ((cpp_reader *, char *, int, int)); -struct search_path * remove_dup_dir PARAMS ((cpp_reader *, +static struct search_path * remove_dup_dir PARAMS ((cpp_reader *, struct search_path *)); -struct search_path * remove_dup_dirs PARAMS ((cpp_reader *, +static struct search_path * remove_dup_dirs PARAMS ((cpp_reader *, struct search_path *)); static void merge_include_chains PARAMS ((cpp_reader *)); static void do_includes PARAMS ((cpp_reader *, @@ -264,7 +264,7 @@ append_include_chain (pfile, dir, path, cxx_aware) /* Handle a duplicated include path. PREV is the link in the chain before the duplicate. The duplicate is removed from the chain and freed. Returns PREV. */ -struct search_path * +static struct search_path * remove_dup_dir (pfile, prev) cpp_reader *pfile; struct search_path *prev; @@ -285,7 +285,7 @@ remove_dup_dir (pfile, prev) chain, or NULL if the chain is empty. This algorithm is quadratic in the number of -I switches, which is acceptable since there aren't usually that many of them. */ -struct search_path * +static struct search_path * remove_dup_dirs (pfile, head) cpp_reader *pfile; struct search_path *head; @@ -297,20 +297,18 @@ remove_dup_dirs (pfile, head) for (other = head; other != cur; other = other->next) if (INO_T_EQ (cur->ino, other->ino) && cur->dev == other->dev) { - if (cur->sysp) + if (cur->sysp && !other->sysp) { cpp_warning (pfile, "changing search order for system directory \"%s\"", cur->name); if (strcmp (cur->name, other->name)) - cpp_warning (pfile, other->sysp - ? " as it is the same as system directory \"%s\"" - : " as it is the same as non-system directory \"%s\"", + cpp_warning (pfile, + " as it is the same as non-system directory \"%s\"", other->name); else - cpp_warning (pfile, other->sysp - ? " as it has already been specified as a system directory" - : " as it has already been specified as a non-system directory"); + cpp_warning (pfile, + " as it has already been specified as a non-system directory"); } cur = remove_dup_dir (pfile, prev); break; |