tesses50/tesses-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix win32 somewhat?

Browse Source
This commit is contained in:
Mike Nolan
2025-04-16 07:47:01 -05:00
parent fefec83b7e
commit bcd3ca9ff8
11 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Http/FileServer.cpp
View File

@ -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;

6
src/Http/HttpServer.cpp
View File

@ -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);

22
src/Http/HttpStream.cpp
View File

@ -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;