dlls/ws2_32/tests/sock.c

[Gerald Pfeifer]

On Tue, 1 Jan 2008, Gerald Pfeifer wrote:
>> 1. the straightforward patch below,
>> 2. adding an  #ifdef WINED3DTEXF_NONE > 0  around those two conditions, 
>> 3. living with the warning.
> since I saw you go for option 1 in the case of basetexture.c, here is
> the analog patch for cubetexture.c. ;-)

And here is one for dlls/ws2_32/tests/sock.c.  Apart from this there is
only a single one left in our tree which I'll hunt down.

ChangeLog:
Remove two noop checks.

Index: dlls/ws2_32/tests/sock.c
===================================================================
RCS file: /home/wine/wine/dlls/ws2_32/tests/sock.c,v
retrieving revision 1.21
diff -u -3 -p -r1.21 sock.c
--- dlls/ws2_32/tests/sock.c	14 Nov 2007 13:35:29 -0000	1.21
+++ dlls/ws2_32/tests/sock.c	2 Jan 2008 14:56:18 -0000
@@ -816,10 +816,10 @@ static void do_test( test_setup *test )
     WaitForSingleObject ( server_ready, INFINITE );
 
     wait = WaitForMultipleObjects ( 1 + n, thread, TRUE, 1000 * TEST_TIMEOUT );
-    ok ( wait >= WAIT_OBJECT_0 && wait <= WAIT_OBJECT_0 + n , 
+    ok ( wait <= WAIT_OBJECT_0 + n , 
          "some threads have not completed: %x\n", wait );
 
-    if ( ! ( wait >= WAIT_OBJECT_0 && wait <= WAIT_OBJECT_0 + n ) )
+    if ( ! ( wait <= WAIT_OBJECT_0 + n ) )
     {
         for (i = 0; i <= n; i++)
         {