public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r9-9657] libstdc++: Re-enable workaround for _wstat64 bug, again [PR 88881]
@ 2021-08-02 15:58 Jonathan Wakely
  0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2021-08-02 15:58 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

https://gcc.gnu.org/g:4178e8c049e4ef366335b661197e53b3efbed877

commit r9-9657-g4178e8c049e4ef366335b661197e53b3efbed877
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Feb 10 16:51:34 2021 +0000

    libstdc++: Re-enable workaround for _wstat64 bug, again [PR 88881]
    
    I forgot that the workaround is present in both filesystem::status and
    filesystem::symlink_status. This restores it in the latter.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/88881
            * src/c++17/fs_ops.cc (fs::symlink_status): Re-enable workaround.
    
    (cherry picked from commit b7210405ed8eb5fd723b2c99960dcc5f0aec89b4)

Diff:
---
 libstdc++-v3/src/c++17/fs_ops.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc
index 7fea05fbf50..c641e2a53f7 100644
--- a/libstdc++-v3/src/c++17/fs_ops.cc
+++ b/libstdc++-v3/src/c++17/fs_ops.cc
@@ -1449,7 +1449,6 @@ fs::symlink_status(const fs::path& p, std::error_code& ec) noexcept
   auto str = p.c_str();
 
 #if _GLIBCXX_FILESYSTEM_IS_WINDOWS
-#if ! defined __MINGW64_VERSION_MAJOR || __MINGW64_VERSION_MAJOR < 6
   // stat() fails if there's a trailing slash (PR 88881)
   path p2;
   if (p.has_relative_path() && !p.has_filename())
@@ -1466,7 +1465,6 @@ fs::symlink_status(const fs::path& p, std::error_code& ec) noexcept
 	}
       str = p2.c_str();
     }
-#endif
 #endif
 
   stat_type st;


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-08-02 15:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-02 15:58 [gcc r9-9657] libstdc++: Re-enable workaround for _wstat64 bug, again [PR 88881] Jonathan Wakely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).