]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
Simplify to include lower-case windows.h always, fix compile on mingw32 (#747)
authorMarco Matthies <redacted>
Mon, 10 Apr 2023 17:57:59 +0000 (19:57 +0200)
committerGitHub <redacted>
Mon, 10 Apr 2023 17:57:59 +0000 (19:57 +0200)
ggml.c

diff --git a/ggml.c b/ggml.c
index 9616eb9fd5e393227f85ad4b6b53e42a7a9bbe4f..a817f8321ed22be9313e84591240a7c9524028f1 100644 (file)
--- a/ggml.c
+++ b/ggml.c
 #define static_assert(cond, msg) struct global_scope_noop_trick
 #endif
 
-#if defined _MSC_VER || defined(__MINGW32__)
+#if defined(_WIN32)
 
-#if !defined(__MINGW32__)
-#include <Windows.h>
-#else
-// ref: https://github.com/ggerganov/whisper.cpp/issues/168
 #include <windows.h>
-#endif
 
 typedef volatile LONG atomic_int;
 typedef atomic_int atomic_bool;