1 files changed, 6 insertions, 8 deletions
diff --git a/boost/archive/iterators/mb_from_wchar.hpp b/boost/archive/iterators/mb_from_wchar.hpp
index deb798f623..d76eb3e2d2 100644
--- a/boost/archive/iterators/mb_from_wchar.hpp
+++ b/boost/archive/iterators/mb_from_wchar.hpp
@@ -18,13 +18,14 @@
 
 #include <boost/assert.hpp>
 #include <cstddef> // size_t
-#include <cstdlib> // for wctomb()
+#include <cwchar> // for mbstate_t and wcrtomb()
 
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
     using ::size_t; 
-    using ::wctomb;
+    using ::mbstate_t;
+    using ::wcrtomb;
 } // namespace std
 #endif
 
@@ -82,13 +83,10 @@ class mb_from_wchar
     }
 
     void fill(){
+        std::mbstate_t mbs;
+        std::wcrtomb(0, 0, &mbs);
         wchar_t value = * this->base_reference();
-        #if (defined(__MINGW32__) && ((__MINGW32_MAJOR_VERSION > 3) \
-        || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 8))))
-        m_bend = std::wcrtomb(m_buffer, value,0);
-        #else
-        m_bend = std::wctomb(m_buffer, value);
-        #endif
+        m_bend = std::wcrtomb(m_buffer, value, &mbs);
         BOOST_ASSERT(-1 != m_bend);
         BOOST_ASSERT((std::size_t)m_bend <= sizeof(m_buffer));
         BOOST_ASSERT(m_bend > 0);