From 1459f9ced783eac4a1f74955bddf5c461d53d788 Mon Sep 17 00:00:00 2001 From: Mike Nolan Date: Wed, 16 Apr 2025 08:42:34 -0500 Subject: [PATCH] Fix win32 somewhat? --- src/runtime_methods/time.cpp | 3 +++ src/types/streamheapobject.cpp | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/runtime_methods/time.cpp b/src/runtime_methods/time.cpp index 2cece72..d9cb20f 100644 --- a/src/runtime_methods/time.cpp +++ b/src/runtime_methods/time.cpp @@ -2,7 +2,10 @@ #include "CrossLang.hpp" #if defined(_WIN32) #include + #include +#undef min +#undef max #else #include #endif diff --git a/src/types/streamheapobject.cpp b/src/types/streamheapobject.cpp index 5406d2e..2fb1d81 100644 --- a/src/types/streamheapobject.cpp +++ b/src/types/streamheapobject.cpp @@ -94,11 +94,9 @@ namespace Tesses::CrossLang arr->data.resize(sz); auto res = dict->CallMethod(ls2, "Read",{arr, (int64_t)0L, (int64_t)sz}); - #if defined(_WIN32) - memcpy(buff,arr->data.data(),min(sz,arr->data.size())); - #else + memcpy(buff,arr->data.data(),std::min(sz,arr->data.size())); - #endif + int64_t r; if(GetObject(res,r)) return r; }