From 73097d3bd3b3b92f549952258a12ac2548a25aca Mon Sep 17 00:00:00 2001
From: Richard Hodges <hodges.r@gmail.com>
Date: Tue, 26 May 2020 13:02:54 +0200
Subject: [PATCH] Fix std::FILE namespace qualification

refs #1944
closes #1962
---
 CHANGELOG.md                                 | 2 ++
 include/boost/beast/core/impl/file_stdio.ipp | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b45c7671..0bd7577d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Fix FILE namespace qualification
+
 Version 294:
 
 * Fix FILE namespace qualification
diff --git a/include/boost/beast/core/impl/file_stdio.ipp b/include/boost/beast/core/impl/file_stdio.ipp
index 19efa4e1..f42521b3 100644
--- a/include/boost/beast/core/impl/file_stdio.ipp
+++ b/include/boost/beast/core/impl/file_stdio.ipp
@@ -47,7 +47,7 @@ operator=(file_stdio&& other)
 
 void
 file_stdio::
-native_handle(FILE* f)
+native_handle(std::FILE* f)
 {
     if(f_)
         fclose(f_);
@@ -119,7 +119,7 @@ open(char const* path, file_mode mode, error_code& ec)
     case file_mode::write_new:
     {
 #if BOOST_WORKAROUND(BOOST_MSVC, < 1910)
-        FILE* f0;
+        std::FILE* f0;
         auto const ev = ::_wfopen_s(&f0, unicode_path.c_str(), L"rb");
         if(! ev)
         {
@@ -161,7 +161,7 @@ open(char const* path, file_mode mode, error_code& ec)
     case file_mode::append_existing:
     {
 #ifdef BOOST_MSVC
-        FILE* f0;
+        std::FILE* f0;
         auto const ev =
             ::_wfopen_s(&f0, unicode_path.c_str(), L"rb+");
         if(ev)