From 32d0fe7e92b393749bc9c9bdd5b05033a15c47e4 Mon Sep 17 00:00:00 2001 From: CoderRC <108188026+CoderRC@users.noreply.github.com> Date: Mon, 3 Apr 2023 17:48:52 -0400 Subject: [PATCH] Trying again to fix error on windows compilation C2589: '(': illegal token --- ggml.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ggml.h b/ggml.h index 14d15ddf8..3a51734cc 100644 --- a/ggml.h +++ b/ggml.h @@ -779,7 +779,27 @@ int ggml_cpu_has_vsx(void); #if defined(_WIN32) && !defined(_POSIX_THREADS) #define WIN32_LEAN_AND_MEAN -#include +#if !defined(min) && !defined(max) +#include +#ifdef min +#undef min +#endif +#ifdef max +#undef max +#endif +#elif defined(min) && defined(max) +#include +#elif !defined(min) +#include +#ifdef max +#undef max +#endif +#elif !defined(max) +#include +#ifdef min +#undef min +#endif +#endif #else #include #endif