Fix win32 somewhat?

include/TessesFramework/Threading/Thread.hpp

@@ -2,6 +2,7 @@
 #include <functional>
 #if defined(_WIN32)
 #include <windows.h>
+#undef min
 #elif defined(GEKKO)
 #include <ogc/lwp.h>
 #elif defined(__SWITCH__)

src/Filesystem/MemoryFilesystem.cpp

@@ -16,11 +16,9 @@ namespace Tesses::Framework::Filesystem
     {
         if(!this->canRead) return 0;
         if(this->pos >= this->data->file.size()) return 0;
-        #if defined(_WIN32)
+       
-        size_t toRead = min(sz, (size_t)(this->data->file.size()-this->pos));
-        #else
         size_t toRead = std::min(sz, (size_t)(this->data->file.size()-this->pos));
-        #endif
+       
         memcpy(buff, this->data->file.data() + this->pos, toRead);
 
         this->pos += toRead;

src/Http/FileServer.cpp

@@ -2,7 +2,6 @@
 #include "TessesFramework/Filesystem/LocalFS.hpp"
 #include "TessesFramework/Filesystem/SubdirFilesystem.hpp"
 #include <iostream>
-#include <unistd.h>
 #include "TessesFramework/Common.hpp"
 using LocalFilesystem = Tesses::Framework::Filesystem::LocalFilesystem;
 using SubdirFilesystem = Tesses::Framework::Filesystem::SubdirFilesystem;

src/Http/HttpServer.cpp

@@ -107,11 +107,9 @@ namespace Tesses::Framework::Http
                 uint8_t finField =  fin ?  0b10000000 : 0;
                 uint8_t opcode2 = i == 0 ? opcode : 0;
                 uint8_t firstByte = finField | (opcode2 & 0xF);
-                #if defined(_WIN32)
+                
-                size_t len = min((size_t)4096,msg->data.size() - offset);
-                #else
                 size_t len = std::min((size_t)4096,msg->data.size()- offset);
-                #endif
+                
                 strm->WriteByte(firstByte);
                 write_len_bytes((uint64_t)len);
                 strm->WriteBlock(msg->data.data() + offset,len);

src/Http/HttpStream.cpp

@@ -57,11 +57,9 @@ namespace Tesses::Framework::Http
         if(this->length == 0) return 0;
         if(this->length > 0)
         {
-            #if defined(_WIN32)
+            
-            len = min((size_t)(this->length - this->position), len);
-            #else
             len = std::min((size_t)(this->length - this->position), len);
-            #endif
+            
             if(len > 0)
                 len = this->strm->Read(buff,len);
             this->position += len;
@@ -73,11 +71,8 @@ namespace Tesses::Framework::Http
             {
                 if(this->offset < this->read)
                 {
-                    #if defined(_WIN32)
+                    
-                    len = min((size_t)(this->read - this->offset), len);
-                    #else
                     len = std::min((size_t)(this->read - this->offset), len);
-                    #endif
                     if(len > 0)
                         len = this->strm->Read(buff,len);
                     this->offset += len;
@@ -107,12 +102,8 @@ namespace Tesses::Framework::Http
                         else
                         {
                             this->offset=0;
-                            #if defined(_WIN32)
                             
-                            len = min((size_t)(this->read - this->offset), len);
-                            #else
                             len = std::min((size_t)(this->read - this->offset), len);
-                            #endif
                             if(len > 0)
                                 len = this->strm->Read(buff,len);
                             this->offset += len;
@@ -136,11 +127,8 @@ namespace Tesses::Framework::Http
         if(this->length == 0) return 0;
         if(this->length > 0)
         {
-            #if defined(_WIN32)
+            
-            len = min((size_t)(this->length - this->position), len);
-            #else
             len = std::min((size_t)(this->length - this->position), len);
-            #endif
             if(len > 0)
                 len = this->strm->Write(buff,len);
             this->position += len;

src/Streams/BufferedStream.cpp

@@ -31,11 +31,8 @@ namespace Tesses::Framework::Streams {
     {
         if(this->offset < this->read)
         { 
-            #if defined(_WIN32)
-            sz = min(sz,this->read-this->offset);
-            #else
             sz = std::min(sz,this->read-this->offset);
-            #endif
+            
             memcpy(buff, this->buffer+this->offset, sz);
             this->offset+=sz;
             return sz;
@@ -44,11 +41,9 @@ namespace Tesses::Framework::Streams {
         {
             this->read = this->strm->Read(this->buffer, this->bufferSize);
             this->offset=0;
-            #if defined(_WIN32)
+            
-            sz = min(sz,this->read-this->offset);
-            #else
             sz = std::min(sz,this->read-this->offset);
-            #endif
+            
             memcpy(buff, this->buffer+this->offset, sz);
             this->offset+=sz;
             return sz;

src/Streams/FileStream.cpp

@@ -1,6 +1,7 @@
 #include "TessesFramework/Streams/FileStream.hpp"
 #if defined(_WIN32)
 #include <windows.h>
+#undef min
 #endif
 namespace Tesses::Framework::Streams
 {

src/Streams/MemoryStream.cpp

@@ -14,11 +14,9 @@ namespace Tesses::Framework::Streams
     size_t MemoryStream::Read(uint8_t* buff, size_t sz)
     {
         if(this->offset >= this->buffer.size()) return 0;
-        #if defined(_WIN32)
+        
-        size_t toRead = min(sz, this->buffer.size()-this->offset);
-        #else
         size_t toRead = std::min(sz, this->buffer.size()-this->offset);
-        #endif
+        
         memcpy(buff, this->buffer.data() + this->offset, toRead);
         this->offset += toRead;
         return toRead;

src/Streams/NetworkStream.cpp

@@ -21,6 +21,7 @@ using HttpUtils = Tesses::Framework::Http::HttpUtils;
 #include <ws2tcpip.h>
 #include <winsock2.h>
 #include <windows.h>
+#undef min
 #pragma comment(lib, "ws2_32.lib")
 #else
 extern "C" {

src/TF_Init.cpp

@@ -4,6 +4,7 @@
 #include <csignal>
 #if defined(_WIN32)
 #include <windows.h>
+#undef min
 #include <cstdio>
 #elif defined(__SWITCH__)
 extern "C" {

src/Threading/Mutex.cpp

@@ -3,6 +3,7 @@
 #include <iostream>
 #if defined(_WIN32)
 #include <windows.h>
+#undef min
 #elif defined(GEKKO)
 #include <ogc/mutex.h>
 #elif defined(__SWITCH__)