From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 42C2D388A437; Tue, 20 Apr 2021 18:53:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 42C2D388A437 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 r9-9377] libstdc++: Fix spelling of __MINGW32__ macros X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: 4160c7da622cf5032296b72ef9e43bf6548dd25a X-Git-Newrev: 5e12dd3428ad1f4ca59c17cd98ea3975a5fae0e9 Message-Id: <20210420185300.42C2D388A437@sourceware.org> Date: Tue, 20 Apr 2021 18:53:00 +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: Tue, 20 Apr 2021 18:53:00 -0000 https://gcc.gnu.org/g:5e12dd3428ad1f4ca59c17cd98ea3975a5fae0e9 commit r9-9377-g5e12dd3428ad1f4ca59c17cd98ea3975a5fae0e9 Author: Jonathan Wakely Date: Wed Feb 10 16:37:39 2021 +0000 libstdc++: Fix spelling of __MINGW32__ macros libstdc++-v3/ChangeLog: * testsuite/27_io/filesystem/operations/proximate.cc: Fix typo in __MINGW32__ macro name. * testsuite/27_io/filesystem/path/compare/lwg2936.cc: Likewise. * testsuite/27_io/filesystem/path/generation/proximate.cc: Likewise. * testsuite/27_io/filesystem/path/generation/relative.cc: Likewise. * testsuite/util/testsuite_fs.h: Likewise. (cherry picked from commit 6a6f74be9d6891cb0c17c493b1f9bca20673e6a0) Diff: --- libstdc++-v3/testsuite/27_io/filesystem/operations/proximate.cc | 2 +- libstdc++-v3/testsuite/27_io/filesystem/path/compare/lwg2936.cc | 2 +- libstdc++-v3/testsuite/27_io/filesystem/path/generation/proximate.cc | 2 +- libstdc++-v3/testsuite/27_io/filesystem/path/generation/relative.cc | 2 +- libstdc++-v3/testsuite/util/testsuite_fs.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/proximate.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/proximate.cc index 8a7e258628a..e21b544c9b2 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/proximate.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/proximate.cc @@ -30,7 +30,7 @@ using __gnu_test::compare_paths; std::string operator""_norm(const char* s, std::size_t n) { std::string str(s, n); -#if defined(__MING32__) || defined(__MINGW64__) +#if defined(__MINGW32__) || defined(__MINGW64__) for (auto& c : str) if (c == '/') c = '\\'; diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/compare/lwg2936.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/compare/lwg2936.cc index bcb99cc6ddc..a7e02bf2ddc 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/compare/lwg2936.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/compare/lwg2936.cc @@ -59,7 +59,7 @@ test01() check("c:", "d:", -1); check("c:", "c:/", -1); check("d:", "c:/", +1); -#if defined(__MING32__) || defined(__MINGW64__) +#if defined(__MINGW32__) || defined(__MINGW64__) check("c:/a/b", "c:a/b", +1); #else check("c:/a/b", "c:a/b", -1); diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/generation/proximate.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/generation/proximate.cc index 1d666791001..9b68e04207a 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/generation/proximate.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/generation/proximate.cc @@ -29,7 +29,7 @@ using __gnu_test::compare_paths; std::string operator""_norm(const char* s, std::size_t n) { std::string str(s, n); -#if defined(__MING32__) || defined(__MINGW64__) +#if defined(__MINGW32__) || defined(__MINGW64__) for (auto& c : str) if (c == '/') c = '\\'; diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/generation/relative.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/generation/relative.cc index dde08d46f2c..201b76c1238 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/generation/relative.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/generation/relative.cc @@ -29,7 +29,7 @@ using __gnu_test::compare_paths; std::string operator""_norm(const char* s, std::size_t n) { std::string str(s, n); -#if defined(__MING32__) || defined(__MINGW64__) +#if defined(__MINGW32__) || defined(__MINGW64__) for (auto& c : str) if (c == '/') c = '\\'; diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h index fe42845ac4f..334bc81f3c1 100644 --- a/libstdc++-v3/testsuite/util/testsuite_fs.h +++ b/libstdc++-v3/testsuite/util/testsuite_fs.h @@ -82,7 +82,7 @@ namespace __gnu_test test_fs::path root_path() { -#if defined(__MING32__) || defined(__MINGW64__) +#if defined(__MINGW32__) || defined(__MINGW64__) return L"c:/"; #else return "/";