From f9325e99bbc83f975ce423efaaaded73400b08e3 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 30 Apr 2021 14:25:25 +0100
Subject: [PATCH] libstdc++: Use <sys/socket.h> features conditionally [PR
 100285]

This makes the uses of getsockopt and setsockopt in
<experimental/socket> conditional on the availability of <sys/socket.h>.

It also fixes a test to check for <sys/socket.h> instead of <socket.h>.

libstdc++-v3/ChangeLog:

	PR libstdc++/100285
	* include/experimental/socket (__basic_socket_impl::set_option)
	(__basic_socket_impl::get_option) [!_GLIBCXX_HAVE_SYS_SOCKET_H]:
	Just set error code.
	* testsuite/experimental/net/socket/socket_base.cc: CHeck
	for <sys/socket.h> not <socket.h>.

(cherry picked from commit 0d501c338548152f9d2728d383eec3e9cef16784)
---
 libstdc++-v3/include/experimental/socket                  | 8 ++++++++
 .../testsuite/experimental/net/socket/socket_base.cc      | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/experimental/socket b/libstdc++-v3/include/experimental/socket
index bf6a8c87e67d..9db4a245ccfc 100644
--- a/libstdc++-v3/include/experimental/socket
+++ b/libstdc++-v3/include/experimental/socket
@@ -622,6 +622,7 @@ inline namespace v1
 	void
 	set_option(const _SettableSocketOption& __option, error_code& __ec)
 	{
+# ifdef _GLIBCXX_HAVE_SYS_SOCKET_H
 	  int __result = ::setsockopt(_M_sockfd, __option.level(_M_protocol),
 				      __option.name(_M_protocol),
 				      __option.data(_M_protocol),
@@ -630,12 +631,16 @@ inline namespace v1
 	    __ec.assign(errno, generic_category());
 	  else
 	    __ec.clear();
+#else
+	  __ec = std::make_error_code(std::errc::not_supported);
+#endif
 	}
 
       template<typename _GettableSocketOption>
 	void
 	get_option(_GettableSocketOption& __option, error_code& __ec) const
 	{
+# ifdef _GLIBCXX_HAVE_SYS_SOCKET_H
 	  int __result = ::getsockopt(_M_sockfd, __option.level(_M_protocol),
 				      __option.name(_M_protocol),
 				      __option.data(_M_protocol),
@@ -644,6 +649,9 @@ inline namespace v1
 	    __ec.assign(errno, generic_category());
 	  else
 	    __ec.clear();
+#else
+	  __ec = std::make_error_code(std::errc::not_supported);
+#endif
 	}
 
       template<typename _IoControlCommand>
diff --git a/libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc b/libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc
index 1c02c5a09dac..f957b6c92f65 100644
--- a/libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc
+++ b/libstdc++-v3/testsuite/experimental/net/socket/socket_base.cc
@@ -129,7 +129,7 @@ void check_integer_sockopt()
 
 void test_option_types()
 {
-#if __has_include(<socket.h>)
+#if __has_include(<sys/socket.h>)
   check_boolean_sockopt<S::broadcast>();
 
   check_boolean_sockopt<S::debug>();
@@ -174,7 +174,7 @@ void test_option_types()
 
 void test_constants()
 {
-#if __has_include(<socket.h>)
+#if __has_include(<sys/socket.h>)
   static_assert( is_enum<S::shutdown_type>::value, "" );
   static_assert( S::shutdown_receive != S::shutdown_send, "" );
   static_assert( S::shutdown_receive != S::shutdown_both, "" );
-- 
2.47.2