2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index be2c81b..5a5bbdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-23  Ross Johnson  <rpj@setup1.ise.canberra.edu.au>
+
+	Contributed by - "Phil Frisbie, Jr." <phil@hawksoft.com>
+
+	* tsd.c (pthread_getspecific): Preserve the last
+	winsock error [from WSAGetLastError()].
+
 2001-07-18  Ross Johnson  <rpj@setup1.ise.canberra.edu.au>
 
 	Contributed by - "Scott McCaskill" <scott@magruder.org>
diff --git a/tsd.c b/tsd.c
index 3cbebae..7b692b8 100644
--- a/tsd.c
+++ b/tsd.c
@@ -323,10 +323,12 @@ pthread_getspecific (pthread_key_t key)
       */
 {
   int lasterror = GetLastError();
+  int lastWSAerror = WSAGetLastError();
 
   void *ptr = TlsGetValue (key->key);
 
   SetLastError( lasterror );
+  WSASetLastError( lastWSAerror );
 
   return ptr;
 }