From 6a6f74be9d6891cb0c17c493b1f9bca20673e6a0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 10 Feb 2021 16:37:39 +0000 Subject: [PATCH] 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. --- .../testsuite/27_io/filesystem/operations/proximate.cc | 2 +- .../testsuite/27_io/filesystem/path/compare/lwg2936.cc | 2 +- .../testsuite/27_io/filesystem/path/generation/proximate.cc | 2 +- .../testsuite/27_io/filesystem/path/generation/relative.cc | 4 ++-- libstdc++-v3/testsuite/util/testsuite_fs.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/proximate.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/proximate.cc index 1ab2aa6603f..dc5b926b858 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 892b82ae621..998be2aad6d 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 1851e5de790..6b463c3886a 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 388c415fbaf..f56cf6ed452 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 = '\\'; @@ -80,7 +80,7 @@ test03() void test04() { -#if defined(__MING32__) || defined(__MINGW64__) +#if defined(__MINGW32__) || defined(__MINGW64__) // DR 3070 compare_paths(path("c:/f:o/bar").lexically_relative("c:/f:o/bar"), "."); compare_paths(path("c:/foo/bar").lexically_relative("c:/foo/b:r"), "..\\bar"); diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h index 80774b69e99..4cda0eefeaf 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 "/"; -- 2.30.2