* cygtls.cc (_cygtls::handle_threadlist_exception): Make an error fatal.

* cygtls.h (sockaddr_in): Use header rather than defining our own structure.
* exceptions.cc (_cygtls::interrupt_setup): Use exact contents of sa_mask
rather than assuming tht current sig should be masked, too.
(_cygtls::call_signal_handler): Use more aggressive locking.
* gendef (_sigbe): Wait until later before releasing incyg.
(_sigreturn): Remove more arguments to accommodate quasi-sa_sigaction support.
(_sigdelayed): Push arguments for sa_sigaction.  More work needed here.
* signal.cc (sigaction): Implement SA_NODEFER.
* tlsoffsets.h: Regenerate.

* sigproc.cc (wait_sig): Use default buffer size of Windows 9x complains.
* pinfo.cc (_onreturn::dummy_handle): Remove.
(_onreturn::h): Make this a pointer.
(_onreturn::~_onreturn): Detect whether pointer is NULL rather than value is
NULL.
(_onreturn::_onreturn): Set h to NULL initially.
(_onreturn::no_close_p_handle): Set h to NULL.
(winpids::add): Initialize onreturn with value from p.hProcess immediately.

1 files changed, 2 insertions, 25 deletions

diff --git a/winsup/cygwin/cygtls.h b/winsup/cygwin/cygtls.h
index 7ce70e04b..6feee64d0 100644
--- a/winsup/cygwin/cygtls.h
+++ b/winsup/cygwin/cygtls.h
@@ -18,31 +18,8 @@ details. */
 #undef _NOMNTENT_FUNCS
 #include <setjmp.h>
 #include <exceptions.h>
-
 #ifndef _WINSOCK_H
-/* Stupid hack: Including winsock.h explicitly causes too many problems. */
-struct sockaddr_in
-{
-  short   sin_family;
-  u_short sin_port;
-  struct in_addr
-  {
-    union
-    {
-      struct
-      {
-	u_char s_b1, s_b2, s_b3, s_b4;
-      } S_un_b;
-      struct
-      {
-	u_short s_w1, s_w2;
-      } S_un_w;
-      u_long S_addr;
-    } S_un;
-  };
-  struct  in_addr sin_addr;
-  char    sin_zero[8];
-};
+#include <netinet/in.h>
 typedef unsigned int SOCKET;
 #endif
 
@@ -186,11 +163,11 @@ struct _cygtls
   san andreas;
   waitq wq;
   struct _cygtls *prev, *next;
-  __stack_t *stackptr;
   int sig;
   unsigned incyg;
   unsigned spinning;
   unsigned stacklock;
+  __stack_t *stackptr;
   __stack_t stack[TLS_STACK_SIZE];
   unsigned padding[0];