From f43aca0f63b92b5a20f70a52bdf51df53dd3c67b Mon Sep 17 00:00:00 2001 From: Marco Matthies <71844+marcom@users.noreply.github.com> Date: Mon, 3 Apr 2023 21:00:19 +0200 Subject: [PATCH] Simplify to include lower-case windows.h always, fix compilation on mingw32 --- ggml.c | 5 ----- llama.cpp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ggml.c b/ggml.c index 59e84ab45..9d70ebd56 100644 --- a/ggml.c +++ b/ggml.c @@ -28,12 +28,7 @@ #if defined _MSC_VER || defined(__MINGW32__) -#if !defined(__MINGW32__) -#include -#else -// ref: https://github.com/ggerganov/whisper.cpp/issues/168 #include -#endif typedef volatile LONG atomic_int; typedef atomic_int atomic_bool; diff --git a/llama.cpp b/llama.cpp index 854bb8993..78cf9395f 100644 --- a/llama.cpp +++ b/llama.cpp @@ -14,7 +14,7 @@ #if defined(_WIN32) && !defined(_POSIX_MAPPED_FILES) #define WIN32_LEAN_AND_MEAN -#include +#include #else #include #include