Re: [PATCH]: update tls and lock tests, gl_cond_t WIN32 implementation

[Bruno Haible]

Hi Yoann,

Thanks for the rapid testing.

> Attached is a patch that fixes some compilation problem due to the
> latest cond and select changes. 
> 
> Additionally, it seems the cond timedwait test are now failing under
> WIN32, although I did not attempt to trace the problem yet.

Your fix for the 'cond' related compilation error was not right: the
variable 'ret' would have been used uninitialized. I've committed the
appended fix. With it, the testsuite passes.

Your fix to test-poll.c and test-select.c is right: obviously <sys/ioctl.h>
must be included for the declaration of ioctl() now. Applied.

Bruno


2008-10-13  Bruno Haible  <address@hidden>

        * lib/glthread/cond.c (glthread_cond_wait_func,
        glthread_cond_timedwait_func): Fix variable name.
        Reported by Yoann Vandoorselaere <address@hidden>.

--- lib/glthread/cond.c.orig    2008-10-14 03:40:04.000000000 +0200
+++ lib/glthread/cond.c 2008-10-14 03:35:38.000000000 +0200
@@ -179,7 +179,7 @@
        LeaveCriticalSection (&cond->lock);
 
        return (err ? err :
-               ret == WAIT_OBJECT_0 ? 0 :
+               result == WAIT_OBJECT_0 ? 0 :
                /* WAIT_FAILED shouldn't happen */ EAGAIN);
       }
     }
@@ -305,8 +305,8 @@
        LeaveCriticalSection (&cond->lock);
 
        return (err ? err :
-               ret == WAIT_OBJECT_0 ? 0 :
-               ret == WAIT_TIMEOUT ? ETIMEDOUT :
+               result == WAIT_OBJECT_0 ? 0 :
+               result == WAIT_TIMEOUT ? ETIMEDOUT :
                /* WAIT_FAILED shouldn't happen */ EAGAIN);
       }
     }