diff options
| author | Ian Lance Taylor <iant@golang.org> | 2023-03-29 09:01:23 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2023-03-29 09:01:23 -0700 |
| commit | 6612f4f8cb9b0d5af18ec69ad04e56debc3e6ced (patch) | |
| tree | 1deecdcfbf185c7044bc861d0ace51285c96cb62 /libcpp/files.cc | |
| parent | 795cffe109e28b248a54b8ee583cbae48368c2a7 (diff) | |
| parent | aa8f4242efc99f24de73c59d53996f28db28c13f (diff) | |
| download | gcc-6612f4f8cb9b0d5af18ec69ad04e56debc3e6ced.zip gcc-6612f4f8cb9b0d5af18ec69ad04e56debc3e6ced.tar.gz gcc-6612f4f8cb9b0d5af18ec69ad04e56debc3e6ced.tar.bz2 | |
Merge from trunk revision aa8f4242efc99f24de73c59d53996f28db28c13f.
Diffstat (limited to 'libcpp/files.cc')
| -rw-r--r-- | libcpp/files.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcpp/files.cc b/libcpp/files.cc index 24208f7..3f8a810 100644 --- a/libcpp/files.cc +++ b/libcpp/files.cc @@ -1,5 +1,5 @@ /* Part of CPP library. File handling. - Copyright (C) 1986-2022 Free Software Foundation, Inc. + Copyright (C) 1986-2023 Free Software Foundation, Inc. Written by Per Bothner, 1994. Based on CCCP program by Paul Rubin, June 1986 Adapted to ANSI C, Richard Stallman, Jan 1987 @@ -1833,7 +1833,7 @@ remap_filename (cpp_reader *pfile, _cpp_file *file) #ifdef HAVE_DOS_BASED_FILE_SYSTEM { const char *p2 = strchr (fname, '\\'); - if (!p || (p > p2)) + if (!p || (p2 && p > p2)) p = p2; } #endif |