diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-12-15 15:01:01 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-06-23 22:21:23 +0200 |
| commit | 222e412f8de7b8296442b22afe510c5c0f995928 (patch) | |
| tree | 51149782a9e6a3bac49002e2dd7fb7e72e5c0712 | |
| parent | aacc4f63d0f8d2d853e1834b27a13ac97ea1011b (diff) | |
| download | cygnal-222e412f8de7b8296442b22afe510c5c0f995928.tar.gz cygnal-222e412f8de7b8296442b22afe510c5c0f995928.tar.bz2 cygnal-222e412f8de7b8296442b22afe510c5c0f995928.zip | |
Drop has_sendmsg flag
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 3 | ||||
| -rw-r--r-- | winsup/cygwin/wincap.cc | 7 | ||||
| -rw-r--r-- | winsup/cygwin/wincap.h | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index a2548589c..71a7bdc53 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1979,8 +1979,7 @@ fhandler_socket::sendmsg (const struct msghdr *msg, int flags) } /* Disappointing but true: Even if WSASendMsg is supported, it's only supported for datagram and raw sockets. */ - DWORD controllen = (DWORD) (!wincap.has_sendmsg () - || get_socket_type () == SOCK_STREAM + DWORD controllen = (DWORD) (get_socket_type () == SOCK_STREAM || get_addr_family () == AF_LOCAL ? 0 : msg->msg_controllen); WSAMSG wsamsg = { msg->msg_name ? (struct sockaddr *) &sst : NULL, len, diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc index 3fd7a4ad3..0aea24c14 100644 --- a/winsup/cygwin/wincap.cc +++ b/winsup/cygwin/wincap.cc @@ -24,7 +24,6 @@ wincaps wincap_xpsp2 __attribute__((section (".cygwin_dll_common"), shared)) = { needs_count_in_si_lpres2:false, has_gaa_largeaddress_bug:false, has_transactions:false, - has_sendmsg:false, has_broken_udf:true, has_broken_alloc_console:false, has_always_all_codepages:false, @@ -54,7 +53,6 @@ wincaps wincap_2003 __attribute__((section (".cygwin_dll_common"), shared)) = { needs_count_in_si_lpres2:false, has_gaa_largeaddress_bug:false, has_transactions:false, - has_sendmsg:false, has_broken_udf:true, has_broken_alloc_console:false, has_always_all_codepages:false, @@ -84,7 +82,6 @@ wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = { needs_count_in_si_lpres2:true, has_gaa_largeaddress_bug:true, has_transactions:true, - has_sendmsg:true, has_broken_udf:false, has_broken_alloc_console:false, has_always_all_codepages:true, @@ -114,7 +111,6 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = { needs_count_in_si_lpres2:false, has_gaa_largeaddress_bug:true, has_transactions:true, - has_sendmsg:true, has_broken_udf:false, has_broken_alloc_console:true, has_always_all_codepages:true, @@ -144,7 +140,6 @@ wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = { needs_count_in_si_lpres2:false, has_gaa_largeaddress_bug:false, has_transactions:true, - has_sendmsg:true, has_broken_udf:false, has_broken_alloc_console:true, has_always_all_codepages:true, @@ -174,7 +169,6 @@ wincaps wincap_10 __attribute__((section (".cygwin_dll_common"), shared)) = { needs_count_in_si_lpres2:false, has_gaa_largeaddress_bug:false, has_transactions:true, - has_sendmsg:true, has_broken_udf:false, has_broken_alloc_console:true, has_always_all_codepages:true, @@ -204,7 +198,6 @@ wincaps wincap_10_1511 __attribute__((section (".cygwin_dll_common"), shared)) = needs_count_in_si_lpres2:false, has_gaa_largeaddress_bug:false, has_transactions:true, - has_sendmsg:true, has_broken_udf:false, has_broken_alloc_console:true, has_always_all_codepages:true, diff --git a/winsup/cygwin/wincap.h b/winsup/cygwin/wincap.h index 441a11234..b4989b6e8 100644 --- a/winsup/cygwin/wincap.h +++ b/winsup/cygwin/wincap.h @@ -17,7 +17,6 @@ struct wincaps unsigned needs_count_in_si_lpres2 : 1; unsigned has_gaa_largeaddress_bug : 1; unsigned has_transactions : 1; - unsigned has_sendmsg : 1; unsigned has_broken_udf : 1; unsigned has_broken_alloc_console : 1; unsigned has_always_all_codepages : 1; @@ -72,7 +71,6 @@ public: bool IMPLEMENT (needs_count_in_si_lpres2) bool IMPLEMENT (has_gaa_largeaddress_bug) bool IMPLEMENT (has_transactions) - bool IMPLEMENT (has_sendmsg) bool IMPLEMENT (has_broken_udf) bool IMPLEMENT (has_broken_alloc_console) bool IMPLEMENT (has_always_all_codepages) |