From 02e221b774df967ea766df431f3efdb992eb0be2 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 29 Jan 2005 03:09:50 +0000 Subject: * cygtls.cc (cygtls::call2): Move socket cleanup. (cygtls::remove): Move socket cleanup here. Don't use _my_tls to reference it. --- winsup/cygwin/cygtls.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/cygtls.cc') diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc index 22db63683..9f0c97a58 100644 --- a/winsup/cygwin/cygtls.cc +++ b/winsup/cygwin/cygtls.cc @@ -91,10 +91,6 @@ _cygtls::call2 (DWORD (*func) (void *, void *), void *arg, void *buf) _my_tls.init_thread (buf, func); DWORD res = func (arg, buf); _my_tls.remove (INFINITE); - // FIXME: Need some sort of atthreadexit function to allow things like - // select to control this themselves - if (_my_tls.locals.exitsock != INVALID_SOCKET) - closesocket (_my_tls.locals.exitsock); ExitThread (res); } @@ -156,6 +152,10 @@ void _cygtls::remove (DWORD wait) { debug_printf ("wait %p\n", wait); + // FIXME: Need some sort of atthreadexit function to allow things like + // select to control this themselves + if (_my_tls.locals.exitsock != INVALID_SOCKET) + closesocket (locals.exitsock); do { sentry here (wait); -- cgit v1.2.3