diff options
| author | Conrad Scott <conrad.scott@dsl.pipex.com> | 2002-09-17 19:38:48 +0400 |
|---|---|---|
| committer | Conrad Scott <conrad.scott@dsl.pipex.com> | 2002-09-17 19:38:48 +0400 |
| commit | 7bbf94b56ec6945e1a0daf638d5224d49674d0cc (patch) | |
| tree | 3592f258cc751a6852879bd1fbd89cab0c9ab8d0 | |
| parent | 8bc7e1a384e4c749b9c90c06fd5a98e0154a8ee0 (diff) | |
Merged changes from HEAD
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/thread.cc | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a654b20ba..29da76c81 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2002-09-17 Robert Collins <rbtcollins@hotmail.com> + + * thread.cc (pthread_key::set): Preserve GetLastError(). Reported + by Thomas Pffaf. + 2002-09-17 Robert Collins <rbtcollins@hotmail.com> This work inspires by Thomas Pfaff's pthread_fork patch (1). diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index ff1f3e6a2..5dadfee7e 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -1101,8 +1101,10 @@ pthread_key::set (const void *value) void * pthread_key::get () { - set_errno (0); - return TlsGetValue (dwTlsIndex); + int savedError = ::GetLastError(); + void *result = TlsGetValue (dwTlsIndex); + ::SetLastError (savedError); + return result; } void |