diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-11 11:13:27 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-11 11:13:27 +0000 |
| commit | c41143fb1d63596ff2a0f6da741b4bae73b8be16 (patch) | |
| tree | d70c0763693cfef7bc877f21e079986944261a5f /gcc/cp/lex.c | |
| parent | eb0badc13724022c8828a55e516d0eecdc487cc3 (diff) | |
| download | gcc-c41143fb1d63596ff2a0f6da741b4bae73b8be16.tar.gz | |
2011-05-11 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 173647 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@173652 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/lex.c')
| -rw-r--r-- | gcc/cp/lex.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 852c3a2867a..691a2ec1311 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -280,10 +280,10 @@ interface_strcmp (const char* s) const char *t1 = ifiles->filename; s1 = s; - if (*s1 != *t1 || *s1 == 0) + if (*s1 == 0 || filename_ncmp (s1, t1, 1) != 0) continue; - while (*s1 == *t1 && *s1 != 0) + while (*s1 != 0 && filename_ncmp (s1, t1, 1) == 0) s1++, t1++; /* A match. */ @@ -412,7 +412,7 @@ handle_pragma_implementation (cpp_reader* dfile ATTRIBUTE_UNUSED ) for (; ifiles; ifiles = ifiles->next) { - if (! strcmp (ifiles->filename, filename)) + if (! filename_cmp (ifiles->filename, filename)) break; } if (ifiles == 0) @@ -706,8 +706,8 @@ in_main_input_context (void) struct tinst_level *tl = outermost_tinst_level(); if (tl) - return strcmp (main_input_filename, - LOCATION_FILE (tl->locus)) == 0; + return filename_cmp (main_input_filename, + LOCATION_FILE (tl->locus)) == 0; else - return strcmp (main_input_filename, input_filename) == 0; + return filename_cmp (main_input_filename, input_filename) == 0; } |