file_stdio uses _wfopen_s when _WIN32 is defined

Author: ashtum

src/file_stdio.cpp

@@ -85,7 +85,7 @@ open(char const* path, file_mode mode,
         f_ = nullptr;
     }
     ec = {};
-#if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+#ifdef _WIN32
     boost::winapi::WCHAR_ const* s;
     detail::win32_unicode_path unicode_path(path, ec);
     if (ec)
@@ -97,23 +97,23 @@ open(char const* path, file_mode mode,
     {
     default:
     case file_mode::read:
-    #if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+    #ifdef _WIN32
         s = L"rb";
     #else
         s = "rb";
     #endif
         break;
 
     case file_mode::scan:
-    #if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+    #ifdef _WIN32
         s = L"rbS";
     #else
         s = "rb";
     #endif
         break;
 
     case file_mode::write:
-    #if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+    #ifdef _WIN32
         s = L"wb+";
     #else
         s = "wb+";
@@ -122,7 +122,7 @@ open(char const* path, file_mode mode,
 
     case file_mode::write_new:
     {
-#if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+#ifdef _WIN32
 # if (defined(BOOST_MSVC) && BOOST_MSVC >= 1910) || (defined(_MSVC_STL_VERSION) && _MSVC_STL_VERSION >= 141)
         s = L"wbx";
 # else
@@ -151,15 +151,15 @@ open(char const* path, file_mode mode,
     }
 
     case file_mode::write_existing:
-    #if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+    #ifdef _WIN32
         s = L"rb+";
     #else
         s = "rb+";
     #endif
         break;
 
     case file_mode::append:
-    #if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+    #ifdef _WIN32
         s = L"ab";
     #else
         s = "ab";
@@ -168,7 +168,7 @@ open(char const* path, file_mode mode,
 
     case file_mode::append_existing:
     {
-#if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+#ifdef _WIN32
         std::FILE* f0;
         auto const ev =
             ::_wfopen_s(&f0, unicode_path.c_str(), L"rb+");
@@ -189,7 +189,7 @@ open(char const* path, file_mode mode,
         }
 #endif
         std::fclose(f0);
-    #if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+    #ifdef _WIN32
         s = L"ab";
     #else
         s = "ab";
@@ -198,7 +198,7 @@ open(char const* path, file_mode mode,
     }
     }
 
-#if defined(BOOST_MSVC) || defined(_MSVC_STL_VERSION)
+#ifdef _WIN32
     auto const ev = ::_wfopen_s(
         &f_, unicode_path.c_str(), s);
     if(ev)

test/unit/file_stdio.cpp

@@ -10,22 +10,6 @@
 // Test that header file is self-contained.
 #include <boost/http_proto/file_stdio.hpp>
 
-#include <boost/config.hpp>
-
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ||                 \
-    defined(__CYGWIN__)
-#define BOOST_HTTP_PROTO_IS_WIN
-#endif
-
-#if defined(BOOST_NO_RTTI) && defined(BOOST_HTTP_PROTO_IS_WIN) &&              \
-    defined(BOOST_GCC)
-
-#include <boost/config/pragma_message.hpp>
-
-BOOST_PRAGMA_MESSAGE("skipping file_stdio_ tests for this configuration")
-
-#else
-
 #include "file_test.hpp"
 #include "test_suite.hpp"
 
@@ -38,7 +22,7 @@ class file_stdio_test
     void
     run()
     {
-#ifdef BOOST_MSVC
+#ifdef _WIN32
         test_file<file_stdio, true>();
 #else
         test_file<file_stdio>();
@@ -51,5 +35,3 @@ TEST_SUITE(
     "boost.http_proto.file_stdio");
 } // http_proto
 } // boost
-
-#endif

test/unit/file_win32.cpp

@@ -10,20 +10,6 @@
 // Test that header file is self-contained.
 #include <boost/http_proto/file_win32.hpp>
 
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) ||                 \
-    defined(__CYGWIN__)
-#define BOOST_HTTP_PROTO_IS_WIN
-#endif
-
-#if defined(BOOST_NO_RTTI) && defined(BOOST_HTTP_PROTO_IS_WIN) &&              \
-    defined(BOOST_GCC)
-
-#include <boost/config/pragma_message.hpp>
-
-BOOST_PRAGMA_MESSAGE("skipping file_win32_ tests for this configuration")
-
-#else
-
 #if BOOST_HTTP_PROTO_USE_WIN32_FILE
 
 #include "file_test.hpp"
@@ -50,4 +36,3 @@ TEST_SUITE(
 } // boost
 
 #endif // BOOST_HTTP_PROTO_USE_WIN32_FILE
-#endif