From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id EE566385C33F; Wed, 15 Jun 2022 08:14:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EE566385C33F MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-10840] libstdc++: Do not use dirent::d_type unconditionally X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 92d5f0c71ea913b9b36c47ab392cc1225434ce3c X-Git-Newrev: 401fbbbda29394c70941ec03b9e9f21777c36178 Message-Id: <20220615081454.EE566385C33F@sourceware.org> Date: Wed, 15 Jun 2022 08:14:54 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2022 08:14:55 -0000 https://gcc.gnu.org/g:401fbbbda29394c70941ec03b9e9f21777c36178 commit r10-10840-g401fbbbda29394c70941ec03b9e9f21777c36178 Author: Jonathan Wakely Date: Tue Feb 1 23:58:08 2022 +0000 libstdc++: Do not use dirent::d_type unconditionally These new tests should not use the d_type member unless it's actually present on the OS. libstdc++-v3/ChangeLog: * testsuite/27_io/filesystem/iterators/error_reporting.cc: Use autoconf macro to check whether d_type is present. * testsuite/experimental/filesystem/iterators/error_reporting.cc: Likewise. (cherry picked from commit d98668eb06f532b2dbe0c721fa1b9ed6e643df27) Diff: --- libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc | 4 ++++ .../testsuite/experimental/filesystem/iterators/error_reporting.cc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc b/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc index 81ef1069367..1f297a731a3 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/error_reporting.cc @@ -36,14 +36,18 @@ extern "C" struct dirent* readdir(DIR*) { case 1: global_dirent.d_ino = 999; +#if defined _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE && defined DT_REG global_dirent.d_type = DT_REG; +#endif global_dirent.d_reclen = 0; std::char_traits::copy(global_dirent.d_name, "file", 5); choice = 0; return &global_dirent; case 2: global_dirent.d_ino = 111; +#if defined _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE && defined DT_DIR global_dirent.d_type = DT_DIR; +#endif global_dirent.d_reclen = 60; std::char_traits::copy(global_dirent.d_name, "subdir", 7); choice = 1; diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc index ade62732028..806c511ebef 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/error_reporting.cc @@ -37,14 +37,18 @@ extern "C" struct dirent* readdir(DIR*) { case 1: global_dirent.d_ino = 999; +#if defined _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE && defined DT_REG global_dirent.d_type = DT_REG; +#endif global_dirent.d_reclen = 0; std::char_traits::copy(global_dirent.d_name, "file", 5); choice = 0; return &global_dirent; case 2: global_dirent.d_ino = 111; +#if defined _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE && defined DT_DIR global_dirent.d_type = DT_DIR; +#endif global_dirent.d_reclen = 60; std::char_traits::copy(global_dirent.d_name, "subdir", 7); choice = 1;