* signal.cc (sigwaitinfo): Change cw_sig to the correct cw_sig_eintr.
This commit is contained in:
		| @@ -1,3 +1,7 @@ | |||||||
|  | 2012-08-07  Christopher Faylor  <me.cygwin2012@cgf.cx> | ||||||
|  |  | ||||||
|  | 	* signal.cc (sigwaitinfo): Change cw_sig to the correct cw_sig_eintr. | ||||||
|  |  | ||||||
| 2012-08-03  Christopher Faylor  <me.cygwin2012@cgf.cx> | 2012-08-03  Christopher Faylor  <me.cygwin2012@cgf.cx> | ||||||
|  |  | ||||||
| 	* exceptions.cc (sigdelayed): Simplify declaration. | 	* exceptions.cc (sigdelayed): Simplify declaration. | ||||||
|   | |||||||
| @@ -580,7 +580,7 @@ sigwaitinfo (const sigset_t *set, siginfo_t *info) | |||||||
|   sig_dispatch_pending (true); |   sig_dispatch_pending (true); | ||||||
|  |  | ||||||
|   int res; |   int res; | ||||||
|   switch (cancelable_wait (NULL, cw_infinite, cw_sig | cw_cancel | cw_cancel_self)) |   switch (cancelable_wait (NULL, cw_infinite, cw_sig_eintr | cw_cancel | cw_cancel_self)) | ||||||
|     { |     { | ||||||
|     case WAIT_SIGNALED: |     case WAIT_SIGNALED: | ||||||
|       if (!sigismember (set, _my_tls.infodata.si_signo)) |       if (!sigismember (set, _my_tls.infodata.si_signo)) | ||||||
| @@ -593,7 +593,6 @@ sigwaitinfo (const sigset_t *set, siginfo_t *info) | |||||||
| 	  if (info) | 	  if (info) | ||||||
| 	    *info = _my_tls.infodata; | 	    *info = _my_tls.infodata; | ||||||
| 	  res = _my_tls.infodata.si_signo; | 	  res = _my_tls.infodata.si_signo; | ||||||
| 	  /* FIXME: Is this right? */ |  | ||||||
| 	  InterlockedExchange ((LONG *) &_my_tls.sig, (LONG) 0); | 	  InterlockedExchange ((LONG *) &_my_tls.sig, (LONG) 0); | ||||||
| 	} | 	} | ||||||
|       break; |       break; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user