[gcc r10-9580] libstdc++: Fix spelling of __MINGW32__ macros

Jonathan Wakely redi@gcc.gnu.org
Mon Mar 29 20:02:14 GMT 2021


https://gcc.gnu.org/g:0a0fd67cd1eabfb4ccd96de180f0298742b30670

commit r10-9580-g0a0fd67cd1eabfb4ccd96de180f0298742b30670
Author: Jonathan Wakely <jwakely@redhat.com>
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  | 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 4aa61b86364..bd58047a0ea 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 b9978edd8f7..a4134262478 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 a67a9054ddb..979c20eb808 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 5b7ba41e568..eaf4f7b7f78 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 bca6e6b5196..76d5e218924 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 "/";


More information about the Libstdc++-cvs mailing list