mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Fix filebuf::native_handle() for Windows

Browse Source 
libstdc++-v3/ChangeLog:

	* acinclude.m4 (GLIBCXX_CHECK_FILEBUF_NATIVE_HANDLES): Add
	missing header to configure test. Check correct variable.
	* config/io/basic_file_stdio.cc (__basic_file<char>::native_handle):
	Fix typo.
	* configure: Regenerate.
	* testsuite/27_io/basic_filebuf/native_handle/char/1.cc: Do not
	call CloseHandle on the native handle.
	* testsuite/27_io/basic_filebuf/native_handle/wchar_t/1.cc:
	Likewise.
This commit is contained in:
Jonathan Wakely 2023-12-14 23:22:28 +00:00
parent 3fa0f9404b
commit 29ad35a1db
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/acinclude.m4
View File

@ -5803,6 +5803,7 @@ AC_LANG_SAVE
AC_TRY_COMPILE([
#if defined(_WIN32) && !defined(__CYGWIN__)
# include <stdint.h>
# include <stdio.h>
# include <io.h>
#endif
],[
@ -5811,7 +5812,7 @@ AC_LANG_SAVE
intptr_t crt_handle = _get_osfhandle(fd);
void* win32_handle = reinterpret_cast<void*>(crt_handle);
], [ac_get_osfhandle=yes], [ac_get_osfhandle=no])
if test "$ac_objext" = yes; then
if test "$ac_get_osfhandle" = yes; then
AC_DEFINE_UNQUOTED(_GLIBCXX_USE__GET_OSFHANDLE, 1,
[Define if _get_osfhandle should be used for filebuf::native_handle().])
fi

2
libstdc++-v3/config/io/basic_file_stdio.cc
View File

@ -472,7 +472,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return _M_cfile;
#elif _GLIBCXX_USE__GET_OSFHANDLE
const intptr_t handle = _M_cfile ? _get_osfhandle(fileno(_M_cfile)) : -1;
return reinterpret_cast<native_handle>(handle);
return reinterpret_cast<native_handle_type>(handle);
#else
return fileno(_M_cfile);
#endif

3
libstdc++-v3/configure vendored
View File

@ -54476,6 +54476,7 @@ $as_echo_n "checking whether _get_osfhandle is defined in <io.h>... " >&6; }
#if defined(_WIN32) && !defined(__CYGWIN__)
# include <stdint.h>
# include <stdio.h>
# include <io.h>
#endif
@ -54498,7 +54499,7 @@ else
ac_get_osfhandle=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$ac_objext" = yes; then
if test "$ac_get_osfhandle" = yes; then
cat >>confdefs.h <<_ACEOF
#define _GLIBCXX_USE__GET_OSFHANDLE 1

9
libstdc++-v3/testsuite/27_io/basic_filebuf/native_handle/char/1.cc
View File

@ -17,8 +17,9 @@ using type = std::basic_filebuf<char>::native_handle_type;
#if __has_include(<unistd.h>)
# include <unistd.h> // close(int)
#endif
#if __has_include(<handleapi.h>)
# include <handleapi.h> // CloseHandle(HANDLE)
#if __has_include(<io.h>)
# include <io.h> // _open_osfhandle
# include <fcntl.h> // _O_RDONLY, _O_TEXT
#endif
#include <testsuite_hooks.h>
@ -38,8 +39,8 @@ test01()
::close(handle); // POSIX
#endif
#if __has_include(<handleapi.h>)
else if constexpr (std::is_same_v<HandleT, void*>)
::CloseHandle(handle); // Windows
else if constexpr (std::is_same_v<HandleT, void*>) // Windows
::_close(::_open_osfhandle((intptr_t)handle, _O_RDONLY|_O_TEXT));
#endif
else
VERIFY( false );

9
libstdc++-v3/testsuite/27_io/basic_filebuf/native_handle/wchar_t/1.cc
View File

@ -10,8 +10,9 @@ using type = std::basic_filebuf<wchar_t>::native_handle_type;
#if __has_include(<unistd.h>)
# include <unistd.h> // close(int)
#endif
#if __has_include(<handleapi.h>)
# include <handleapi.h> // CloseHandle(HANDLE)
#if __has_include(<io.h>)
# include <io.h> // _open_osfhandle
# include <fcntl.h> // _O_RDONLY, _O_TEXT
#endif
#include <testsuite_hooks.h>
@ -31,8 +32,8 @@ test01()
::close(handle); // POSIX
#endif
#if __has_include(<handleapi.h>)
else if constexpr (std::is_same_v<HandleT, void*>)
::CloseHandle(handle); // Windows
else if constexpr (std::is_same_v<HandleT, void*>) // Windows
::_close(::_open_osfhandle((intptr_t)handle, _O_RDONLY|_O_TEXT));
#endif
else
VERIFY( false );