From 4f021ebcbb40be8726912767cafd3b77ae70834e Mon Sep 17 00:00:00 2001 From: kuvaus <22169537+kuvaus@users.noreply.github.com> Date: Tue, 16 May 2023 18:35:33 +0300 Subject: [PATCH] gpt4all-backend: Add MSVC support to backend (#595) * Add MSVC compatibility * Add _MSC_VER macro --------- Co-authored-by: kuvaus --- gpt4all-backend/gptj.cpp | 12 +++++++++++- gpt4all-backend/llamamodel.cpp | 12 +++++++++++- gpt4all-backend/mpt.cpp | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/gpt4all-backend/gptj.cpp b/gpt4all-backend/gptj.cpp index f0eb0eaa..28164318 100644 --- a/gpt4all-backend/gptj.cpp +++ b/gpt4all-backend/gptj.cpp @@ -12,7 +12,17 @@ #include #include #include -#include +#if defined(_WIN32) && defined(_MSC_VER) + #define WIN32_LEAN_AND_MEAN + #ifndef NOMINMAX + #define NOMINMAX + #endif + #include + #include + #include +#else + #include +#endif #include #include diff --git a/gpt4all-backend/llamamodel.cpp b/gpt4all-backend/llamamodel.cpp index 272633c7..cccef1f9 100644 --- a/gpt4all-backend/llamamodel.cpp +++ b/gpt4all-backend/llamamodel.cpp @@ -13,7 +13,17 @@ #include #include #include -#include +#if defined(_WIN32) && defined(_MSC_VER) + #define WIN32_LEAN_AND_MEAN + #ifndef NOMINMAX + #define NOMINMAX + #endif + #include + #include + #include +#else + #include +#endif #include #include #include diff --git a/gpt4all-backend/mpt.cpp b/gpt4all-backend/mpt.cpp index e57cc3c6..0eeb9211 100644 --- a/gpt4all-backend/mpt.cpp +++ b/gpt4all-backend/mpt.cpp @@ -13,7 +13,17 @@ #include #include #include -#include +#if defined(_WIN32) && defined(_MSC_VER) + #define WIN32_LEAN_AND_MEAN + #ifndef NOMINMAX + #define NOMINMAX + #endif + #include + #include + #include +#else + #include +#endif #include #include #include