From bcd3ca9ff85719a9f997cf16c4b272cebb668c03 Mon Sep 17 00:00:00 2001 From: Mike Nolan Date: Wed, 16 Apr 2025 07:47:01 -0500 Subject: [PATCH] Fix win32 somewhat? --- include/TessesFramework/Threading/Thread.hpp | 1 + src/Filesystem/MemoryFilesystem.cpp | 6 ++---- src/Http/FileServer.cpp | 1 - src/Http/HttpServer.cpp | 6 ++---- src/Http/HttpStream.cpp | 22 +++++--------------- src/Streams/BufferedStream.cpp | 13 ++++-------- src/Streams/FileStream.cpp | 1 + src/Streams/MemoryStream.cpp | 6 ++---- src/Streams/NetworkStream.cpp | 1 + src/TF_Init.cpp | 1 + src/Threading/Mutex.cpp | 1 + 11 files changed, 20 insertions(+), 39 deletions(-) diff --git a/include/TessesFramework/Threading/Thread.hpp b/include/TessesFramework/Threading/Thread.hpp index c2f9541..a57abff 100644 --- a/include/TessesFramework/Threading/Thread.hpp +++ b/include/TessesFramework/Threading/Thread.hpp @@ -2,6 +2,7 @@ #include #if defined(_WIN32) #include +#undef min #elif defined(GEKKO) #include #elif defined(__SWITCH__) diff --git a/src/Filesystem/MemoryFilesystem.cpp b/src/Filesystem/MemoryFilesystem.cpp index 2f04189..148d677 100644 --- a/src/Filesystem/MemoryFilesystem.cpp +++ b/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; diff --git a/src/Http/FileServer.cpp b/src/Http/FileServer.cpp index 2b9eab9..6d9a20b 100644 --- a/src/Http/FileServer.cpp +++ b/src/Http/FileServer.cpp @@ -2,7 +2,6 @@ #include "TessesFramework/Filesystem/LocalFS.hpp" #include "TessesFramework/Filesystem/SubdirFilesystem.hpp" #include -#include #include "TessesFramework/Common.hpp" using LocalFilesystem = Tesses::Framework::Filesystem::LocalFilesystem; using SubdirFilesystem = Tesses::Framework::Filesystem::SubdirFilesystem; diff --git a/src/Http/HttpServer.cpp b/src/Http/HttpServer.cpp index 742fb8a..d81a6f2 100644 --- a/src/Http/HttpServer.cpp +++ b/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); diff --git a/src/Http/HttpStream.cpp b/src/Http/HttpStream.cpp index a30c4e1..75d0623 100644 --- a/src/Http/HttpStream.cpp +++ b/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; diff --git a/src/Streams/BufferedStream.cpp b/src/Streams/BufferedStream.cpp index fa7d3dc..469c7f6 100644 --- a/src/Streams/BufferedStream.cpp +++ b/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; diff --git a/src/Streams/FileStream.cpp b/src/Streams/FileStream.cpp index d2761a5..8b4bf38 100644 --- a/src/Streams/FileStream.cpp +++ b/src/Streams/FileStream.cpp @@ -1,6 +1,7 @@ #include "TessesFramework/Streams/FileStream.hpp" #if defined(_WIN32) #include +#undef min #endif namespace Tesses::Framework::Streams { diff --git a/src/Streams/MemoryStream.cpp b/src/Streams/MemoryStream.cpp index c8632d5..670f0f2 100644 --- a/src/Streams/MemoryStream.cpp +++ b/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; diff --git a/src/Streams/NetworkStream.cpp b/src/Streams/NetworkStream.cpp index 0481509..63c6b41 100644 --- a/src/Streams/NetworkStream.cpp +++ b/src/Streams/NetworkStream.cpp @@ -21,6 +21,7 @@ using HttpUtils = Tesses::Framework::Http::HttpUtils; #include #include #include +#undef min #pragma comment(lib, "ws2_32.lib") #else extern "C" { diff --git a/src/TF_Init.cpp b/src/TF_Init.cpp index ea6e397..b57bf37 100644 --- a/src/TF_Init.cpp +++ b/src/TF_Init.cpp @@ -4,6 +4,7 @@ #include #if defined(_WIN32) #include +#undef min #include #elif defined(__SWITCH__) extern "C" { diff --git a/src/Threading/Mutex.cpp b/src/Threading/Mutex.cpp index f387c94..b81bfb9 100644 --- a/src/Threading/Mutex.cpp +++ b/src/Threading/Mutex.cpp @@ -3,6 +3,7 @@ #include #if defined(_WIN32) #include +#undef min #elif defined(GEKKO) #include #elif defined(__SWITCH__)