ecere/sys/GetCurrentThredID(): Changed to return a 64 bit type

[sdk] / ecere / src / net / network.ec

diff --git a/ecere/src/net/network.ec b/ecere/src/net/network.ec
index 0be6edd..2cb1354 100644 (file)
--- a/ecere/src/net/network.ec
+++ b/ecere/src/net/network.ec
@@ -5,11 +5,14 @@ namespace net;
 #if defined(__WIN32__)
 
 #define WIN32_LEAN_AND_MEAN
+#define String _String
 #include <winsock.h>
+#undef String
 static WSADATA wsaData;
 
 #elif defined(__unix__) || defined(__APPLE__)
 default:
+#define set _set
 #define uint _uint
 #include <sys/time.h>
 #include <unistd.h>
@@ -21,6 +24,7 @@ default:
 #include <sys/types.h>
 #include <sys/time.h>
 #include <arpa/inet.h>
+#undef set
 #undef uint
 typedef int SOCKET;
 typedef struct hostent HOSTENT;
@@ -61,7 +65,7 @@ private struct NetworkData
    bool leftOverBytes;
    Mutex processMutex;
    Mutex mutex;
-   int mainThreadID;
+   int64 mainThreadID;
    OldList mtSemaphores;
 };
 
@@ -131,21 +135,21 @@ void Network_DetermineMaxSocket()
    network.ns = 0;
    for(socket = network.sockets.first; socket; socket = socket.next)
       if(!socket.processAlone && !socket.destroyed && socket.s >= network.ns)
-         network.ns = socket.s + 1;
+         network.ns = (int)(socket.s + 1);
    for(socket = network.connectSockets.first; socket; socket = socket.next)
       if(!socket.destroyed && socket.s >= network.ns)
-         network.ns = socket.s + 1;
+         network.ns = (int)(socket.s + 1);
 
    for(service = network.services.first; service; service = service.next)
    {
       if(!service.destroyed && !service.processAlone)
       {
          if(service.s >= network.ns)
-            network.ns = service.s + 1;
+            network.ns = (int)(service.s + 1);
       }
       for(socket = service.sockets.first; socket; socket = socket.next)
          if(!socket.destroyed && !socket.processAlone && socket.s >= network.ns)
-            network.ns = socket.s + 1;
+            network.ns = (int)(socket.s + 1);
    }
    network.mutex.Release();
 }
@@ -207,7 +211,7 @@ void Network_Terminate()
    if(network.networkInitialized)
    {
 #if defined(__WIN32__) || defined(__unix__) || defined(__APPLE__)
-      Service service, next;
+      Service service;
       Socket socket;
 
       guiApp.PauseNetworkEvents();
@@ -233,14 +237,14 @@ void Network_Terminate()
       {
          incref socket;
          //network.sockets.Remove(socket); //THIS IS ALREADY DONE IN Socket::Free
-         socket.Free();
+         socket.Free(true);
          if(socket._refCount > 1) socket._refCount--;
          delete socket;
       }
       while((socket = network.connectSockets.first))
       {
          //network.connectSockets.Remove(socket); //THIS IS ALREADY DONE IN Socket::Free
-         socket.Free();
+         socket.Free(true);
          delete socket;
       }