diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-06-21 05:01:17 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-06-21 05:01:17 +0000 |
| commit | 7c02f861e3512fac608b411cb5be43a41ba8735e (patch) | |
| tree | 56618ecd163acfa86ea2c7dcd5a484cd0b9e3c5b /winsup/cygwin/thread.cc | |
| parent | a7b23a8f11b2e1f2ef333d2ed95d1c972acad12f (diff) | |
| download | cygnal-7c02f861e3512fac608b411cb5be43a41ba8735e.tar.gz cygnal-7c02f861e3512fac608b411cb5be43a41ba8735e.tar.bz2 cygnal-7c02f861e3512fac608b411cb5be43a41ba8735e.zip | |
* uinfo.cc (cygheap_user::ontherange): Use env_name for NetUserGetInfo.
(cygheap_user::env_logsrv): Verify env_domain is valid.
* environ.cc: Include child_info.h and keep spenvs[] sorted.
(environ_init): Check child_proc_info instead of myself->ppid_handle.
Diffstat (limited to 'winsup/cygwin/thread.cc')
| -rw-r--r-- | winsup/cygwin/thread.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index cc24fdca6..1ea5e18b2 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -1588,7 +1588,7 @@ __pthread_join (pthread_t *thread, void **return_val) if ( joiner == *thread) { if (return_val) - *return_val = NULL; + *return_val = NULL; return EDEADLK; } @@ -1597,7 +1597,7 @@ __pthread_join (pthread_t *thread, void **return_val) if((*thread)->attr.joinable == PTHREAD_CREATE_DETACHED) { if (return_val) - *return_val = NULL; + *return_val = NULL; (*thread)->mutex.UnLock (); return EINVAL; } @@ -1608,7 +1608,7 @@ __pthread_join (pthread_t *thread, void **return_val) (*thread)->mutex.UnLock (); WaitForSingleObject ((*thread)->win32_obj_id, INFINITE); if (return_val) - *return_val = (*thread)->return_ptr; + *return_val = (*thread)->return_ptr; // cleanup delete (*thread); } /*End if */ |