diff options
author | Christopher Faylor <me@cgf.cx> | 2001-10-14 08:14:24 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-10-14 08:14:24 +0400 |
commit | 611d92e24c092849635b8395ec97e9c7140a6324 (patch) | |
tree | 940f43e7297df4b8c05d84fb6f99cea0ab1248ff /winsup/cygwin/fhandler_socket.cc | |
parent | 0476bae576d4a21ed57cc55074509c07138d1fba (diff) |
* autoload.cc (load_wsock32): Declare dummy function to force loading of
winsock.
* fhandler.cc (fhandler_base::set_inheritance): Make debugging output more
verbose.
* fhandler_socket.cc (fhandler_socket::fixup_after_fork): Force loading of
winsock32 if winsock2 not available.
* net.cc (set_socket_inheritance): Use DuplicateHandle in all cases to set
inheritance correctly.
(fdsock): Use winsock2_active macro to determine when to set socket
inheritance. Remove fdtab resource locking since this function should already
be protected.
(cygwin_accept): Simplify logic. Ensure that fdtab unlock is not called
inappropriately.
(cygwin_rcmd): Use fdtab locking.
(cygwin_rresvport): Ditto.
(cygwin_rexec): Ditto.
* select.cc (peek_socket): Set errno appropriately if winsock select fails.
* winsup.h: Declare check_pty_fds.
* syscalls.cc (check_pty_fds): Rename from check_ttys_fds. Also check pty
master.
(setsid): Use check_pty_fds.
* dtable.cc (dtable::dec_console_fds): Add check on pty fds.
Diffstat (limited to 'winsup/cygwin/fhandler_socket.cc')
-rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 6c92d1e02..e8f0d1863 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -179,6 +179,7 @@ fhandler_socket::fixup_before_fork_exec (DWORD win_proc_id) } } +extern "C" void __stdcall load_wsock32 (); void fhandler_socket::fixup_after_fork (HANDLE parent) { @@ -197,6 +198,7 @@ fhandler_socket::fixup_after_fork (HANDLE parent) } else if (!new_sock && !winsock2_active) { + load_wsock32 (); fhandler_base::fixup_after_fork (parent); debug_printf ("Without Winsock 2.0"); } |