tesses50/crosslang
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:56:57 -05:00
parent bf3ae1fa02
commit b4c27e33fb
5 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/archive.cpp
View File

@ -245,11 +245,8 @@ namespace Tesses::CrossLang
size_t offset = 0; size_t offset = 0;
uint8_t buff[1024]; uint8_t buff[1024];
do { do {
#if defined(_WIN32)
read = min(min(tableLen-offset,tableLen), sizeof(buff));
#else
read = std::min(std::min(tableLen-offset,tableLen), sizeof(buff)); read = std::min(std::min(tableLen-offset,tableLen), sizeof(buff));
#endif
read = strm->Read(buff,read); read = strm->Read(buff,read);
if(read > 0) if(read > 0)
strm2->WriteBlock(buff,read); strm2->WriteBlock(buff,read);

1
src/runtime_methods/net.cpp
View File

@ -8,7 +8,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <csignal> #include <csignal>
#include <iostream> #include <iostream>
#include <unistd.h>
#include <cstring> #include <cstring>
using namespace Tesses::Framework::Streams; using namespace Tesses::Framework::Streams;
using namespace Tesses::Framework::Http; using namespace Tesses::Framework::Http;

9
src/runtime_methods/time.cpp
View File

@ -1,6 +1,11 @@
#include "CrossLang.hpp" #include "CrossLang.hpp"
#if defined(_WIN32)
#include <windows.h>
#include <time.h>
#else
#include <unistd.h> #include <unistd.h>
#endif
#include "../HowardHinnant_date/date.h" #include "../HowardHinnant_date/date.h"
@ -83,7 +88,11 @@ namespace Tesses::CrossLang
int64_t msec; int64_t msec;
if(GetArgument(args,0,msec)) if(GetArgument(args,0,msec))
{ {
#if defined(_WIN32)
Sleep((int)msec);
#else
usleep(1000*msec); usleep(1000*msec);
#endif
} }
return nullptr; return nullptr;
} }

11
src/vm/gc.cpp
View File

@ -1,8 +1,12 @@
#include "CrossLang.hpp" #include "CrossLang.hpp"
#include <chrono> #include <chrono>
#include <iostream> #include <iostream>
#include <unistd.h>
#include <time.h> #include <time.h>
#if defined(_WIN32)
#include <windows.h>
#else
#include <unistd.h>
#endif
#if defined(CROSSLANG_ENABLE_SQLITE) #if defined(CROSSLANG_ENABLE_SQLITE)
extern "C" { extern "C" {
@ -118,8 +122,11 @@ namespace Tesses::CrossLang
} }
#if defined(_WIN32)
Sleep(100);
#else
usleep(100000); usleep(100000);
#endif
} }
GC::Collect(); GC::Collect();
}); });

43
src/vm/vm.cpp
View File

@ -3005,12 +3005,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 = netStrm->WriteTo(data->data.data()+off,min(len, min(data->data.size() - off, data->data.size())), ip, (int64_t)port);
#else
len = netStrm->WriteTo(data->data.data()+off,std::min(len, std::min(data->data.size() - off, data->data.size())), ip, (int64_t)port); len = netStrm->WriteTo(data->data.data()+off,std::min(len, std::min(data->data.size() - off, data->data.size())), ip, (int64_t)port);
#endif
else else
len = 0; len = 0;
@ -3059,12 +3056,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->Write(data->data.data()+off,min(len, min(data->data.size() - off, data->data.size())));
#else
len = strm->stream->Write(data->data.data()+off,std::min(len, std::min(data->data.size() - off, data->data.size()))); len = strm->stream->Write(data->data.data()+off,std::min(len, std::min(data->data.size() - off, data->data.size())));
#endif
else else
len = 0; len = 0;
@ -3085,12 +3079,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->ReadBlock(data->data.data()+off,min(len, min(data->data.size() - off, data->data.size())));
#else
len = strm->stream->ReadBlock(data->data.data()+off,std::min(len, std::min(data->data.size() - off, data->data.size()))); len = strm->stream->ReadBlock(data->data.data()+off,std::min(len, std::min(data->data.size() - off, data->data.size())));
#endif
else else
len = 0; len = 0;
@ -3292,11 +3283,9 @@ namespace Tesses::CrossLang {
{ {
offdest = bArray2->data.size(); offdest = bArray2->data.size();
} }
#if defined(_WIN32)
len = min(min(bArray->data.size()-offsrc,bArray2->data.size()-offdest),len);
#else
len = std::min<size_t>(std::min<size_t>(bArray->data.size()-offsrc,bArray2->data.size()-offdest),len); len = std::min<size_t>(std::min<size_t>(bArray->data.size()-offsrc,bArray2->data.size()-offdest),len);
#endif
if(len > 0) if(len > 0)
memcpy(bArray2->data.data()+offdest,bArray->data.data()+offsrc,len); memcpy(bArray2->data.data()+offdest,bArray->data.data()+offsrc,len);
cse.back()->Push(gc,bArray2); cse.back()->Push(gc,bArray2);
@ -3342,11 +3331,9 @@ namespace Tesses::CrossLang {
{ {
offdest = bArray->data.size(); offdest = bArray->data.size();
} }
#if defined(_WIN32)
len = min(len,bArray2->data.size()-offsrc);
#else
len = std::min(len,bArray2->data.size()-offsrc); len = std::min(len,bArray2->data.size()-offsrc);
#endif
bArray->data.insert(bArray->data.begin()+offdest,bArray2->data.begin()+offsrc,bArray2->data.begin()+offsrc+len); bArray->data.insert(bArray->data.begin()+offdest,bArray2->data.begin()+offsrc,bArray2->data.begin()+offsrc+len);
cse.back()->Push(gc, bArray); cse.back()->Push(gc, bArray);
@ -3380,11 +3367,8 @@ namespace Tesses::CrossLang {
{ {
off = bArray->data.size(); off = bArray->data.size();
} }
#if defined(_WIN32)
len = min(bArray->data.size() - off,len);
#else
len = std::min<size_t>(bArray->data.size() - off,len); len = std::min<size_t>(bArray->data.size() - off,len);
#endif
bArray->data.insert(bArray->data.end(),bArray2->data.begin()+off,bArray2->data.begin()+off+len); bArray->data.insert(bArray->data.end(),bArray2->data.begin()+off,bArray2->data.begin()+off+len);
cse.back()->Push(gc,bArray); cse.back()->Push(gc,bArray);
return false; return false;
@ -5116,18 +5100,13 @@ namespace Tesses::CrossLang {
{ {
if(closure->closure->args[i].find("$$") == 0) if(closure->closure->args[i].find("$$") == 0)
{ {
#if defined(_WIN32)
return min(argLen,i);
#else
return std::min(argLen,i); return std::min(argLen,i);
#endif
} }
} }
#if defined(_WIN32)
return min(argLen,closure->closure->args.size());
#else
return std::min(argLen,closure->closure->args.size()); return std::min(argLen,closure->closure->args.size());
#endif
}; };
auto trimStart = [](std::string txt)->std::string { auto trimStart = [](std::string txt)->std::string {
if(txt.empty()) return {}; if(txt.empty()) return {};