Fix win32 somewhat?

This commit is contained in:
2025-04-16 08:44:48 -05:00
parent 1459f9ced7
commit 679a388b4c

View File

@ -2969,12 +2969,9 @@ namespace Tesses::CrossLang {
uint16_t port=0; uint16_t port=0;
if(off < len) if(off < len)
#if defined(_WIN32)
len = netStrm->ReadFrom(data->data.data()+off,min(len,min(data->data.size() - off, data->data.size())),ip,port);
#else
len = netStrm->ReadFrom(data->data.data()+off,std::min(len,std::min(data->data.size() - off, data->data.size())),ip,port); len = netStrm->ReadFrom(data->data.data()+off,std::min(len,std::min(data->data.size() - off, data->data.size())),ip,port);
#endif
else else
len = 0; len = 0;
@ -3030,12 +3027,9 @@ namespace Tesses::CrossLang {
size_t len = (size_t)length; size_t len = (size_t)length;
if(off < len) if(off < len)
#if defined(_WIN32)
len = strm->stream->Read(data->data.data()+off,min(len,min(data->data.size() - off, data->data.size())));
#else
len = strm->stream->Read(data->data.data()+off,std::min(len,std::min(data->data.size() - off, data->data.size()))); len = strm->stream->Read(data->data.data()+off,std::min(len,std::min(data->data.size() - off, data->data.size())));
#endif
else else
len = 0; len = 0;
@ -3114,11 +3108,9 @@ namespace Tesses::CrossLang {
size_t len = (size_t)length; size_t len = (size_t)length;
if(off < len) if(off < len)
#if defined(_WIN32)
strm->stream->WriteBlock(data->data.data()+off,min(len,min(data->data.size() - off, data->data.size())));
#else
strm->stream->WriteBlock(data->data.data()+off,std::min(len,std::min(data->data.size() - off, data->data.size()))); strm->stream->WriteBlock(data->data.data()+off,std::min(len,std::min(data->data.size() - off, data->data.size())));
#endif
} }
cse.back()->Push(gc, nullptr); cse.back()->Push(gc, nullptr);