From 002ee64f257f80ee1ca84091a5564669c7db5fbe Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 20 Jul 2001 10:30:47 +0000 Subject: [PATCH] cppinit.c (remove_dup_dir): Make static. * cppinit.c (remove_dup_dir): Make static. (remove_dup_dirs): Make static. Only warn about preempting a system directory with a non-system directory. From-SVN: r44188 --- gcc/ChangeLog | 6 ++++++ gcc/cppinit.c | 20 +++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e9b400a2e0d..7e96c6823c9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-07-20 Nathan Sidwell + + * cppinit.c (remove_dup_dir): Make static. + (remove_dup_dirs): Make static. Only warn about preempting a + system directory with a non-system directory. + 2001-07-19 Geoffrey Keating * ifcvt.c (noce_try_store_flag_constants): Correct order 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; -- 2.30.2