From 2d57ade1b8ecc9362aca16167aec3b3c7450a8b5 Mon Sep 17 00:00:00 2001 From: niansa Date: Wed, 31 May 2023 19:56:40 +0200 Subject: [PATCH] add msvc support -polyfill unistd --- gptj/gptj.cpp | 2 +- llama.cpp-mainline | 2 +- mpt/mpt.cpp | 2 +- msvc_compat_unistd.h | 11 +++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 msvc_compat_unistd.h diff --git a/gptj/gptj.cpp b/gptj/gptj.cpp index c34d593..9dd8086 100644 --- a/gptj/gptj.cpp +++ b/gptj/gptj.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include "../msvc_compat_unistd.h" #include #include #include diff --git a/llama.cpp-mainline b/llama.cpp-mainline index 29cf559..ffb06a3 160000 --- a/llama.cpp-mainline +++ b/llama.cpp-mainline @@ -1 +1 @@ -Subproject commit 29cf5596fe0c37213f9b74e80d8f631193a93f0f +Subproject commit ffb06a345e3a9e30d39aaa5b46a23201a74be6de diff --git a/mpt/mpt.cpp b/mpt/mpt.cpp index 8979867..f1c566f 100644 --- a/mpt/mpt.cpp +++ b/mpt/mpt.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include "../msvc_compat_unistd.h" #include #include #include diff --git a/msvc_compat_unistd.h b/msvc_compat_unistd.h new file mode 100644 index 0000000..225edaf --- /dev/null +++ b/msvc_compat_unistd.h @@ -0,0 +1,11 @@ +#if defined(_WIN32) && defined(_MSC_VER) + #define WIN32_LEAN_AND_MEAN + #ifndef NOMINMAX + #define NOMINMAX + #endif + #include + #include + #include // for _fseeki64 +#else + #include +#endif