Fix win32 somewhat?

src/Streams/BufferedStream.cpp

@@ -30,12 +30,9 @@ namespace Tesses::Framework::Streams {
     size_t BufferedStream::Read(uint8_t* buff, size_t sz)
     {
         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" {