[Orxonox-commit 2689] r7394 - code/branches/ipv6/src/external/enet

[adrfried at orxonox.net]

Author: adrfried
Date: 2010-09-09 20:44:25 +0200 (Thu, 09 Sep 2010)
New Revision: 7394

Modified:
   code/branches/ipv6/src/external/enet/unix.c
   code/branches/ipv6/src/external/enet/win32.c
Log:
use newest WinSock version

Modified: code/branches/ipv6/src/external/enet/unix.c
===================================================================
--- code/branches/ipv6/src/external/enet/unix.c	2010-09-09 16:38:11 UTC (rev 7393)
+++ code/branches/ipv6/src/external/enet/unix.c	2010-09-09 18:44:25 UTC (rev 7394)
@@ -449,6 +449,7 @@
     fd_set readSet, writeSet;
     struct timeval timeVal;
     int selectCount;
+    ENetSocket maxSocket;
 
     timeVal.tv_sec = timeout / 1000;
     timeVal.tv_usec = (timeout % 1000) * 1000;
@@ -472,7 +473,7 @@
             FD_SET (socket6, & readSet);
     }
 
-    ENetSocket maxSocket = 0;
+    maxSocket = 0;
     if (socket4 != ENET_SOCKET_NULL)
         maxSocket = socket4;
     if (socket6 != ENET_SOCKET_NULL && socket6 > maxSocket)

Modified: code/branches/ipv6/src/external/enet/win32.c
===================================================================
--- code/branches/ipv6/src/external/enet/win32.c	2010-09-09 16:38:11 UTC (rev 7393)
+++ code/branches/ipv6/src/external/enet/win32.c	2010-09-09 18:44:25 UTC (rev 7394)
@@ -13,14 +13,14 @@
 int
 enet_initialize (void)
 {
-    WORD versionRequested = MAKEWORD (1, 1);
+    WORD versionRequested = MAKEWORD (2, 2);
     WSADATA wsaData;
    
     if (WSAStartup (versionRequested, & wsaData))
        return -1;
 
-    if (LOBYTE (wsaData.wVersion) != 1||
-        HIBYTE (wsaData.wVersion) != 1)
+    if (LOBYTE (wsaData.wVersion) != 2||
+        HIBYTE (wsaData.wVersion) != 2)
     {
        WSACleanup ();