X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2Fwin32%2FOSThreads.c;h=5559765cb4bfa3fc40fe5015dc0f6cb9b2c09b27;hb=7f9c0373aacaf59f30aa9f275dcace505c8d5d89;hp=e4cd76b7dcfdc34cfc2ba8e076c2df736bdd67ce;hpb=2909e6fb2223bd303e00b34d3a04466474c53f03;p=ghc-hetmet.git

diff --git a/ghc/rts/win32/OSThreads.c b/ghc/rts/win32/OSThreads.c
index e4cd76b..5559765 100644
--- a/ghc/rts/win32/OSThreads.c
+++ b/ghc/rts/win32/OSThreads.c
@@ -137,9 +137,13 @@ getThreadLocalVar (ThreadLocalKey *key)
 {
     void *r;
     r = TlsGetValue(*key);
-    if (r == NULL) {
+#ifdef DEBUG
+    // r is allowed to be NULL - it can mean that either there was an
+    // error or the stored value is in fact NULL.
+    if (GetLastError() != NO_ERROR) {
 	barf("getThreadLocalVar: key not found");
     }
+#endif
     return r;
 }