From: Marco Matthies <redacted>
Date: Mon, 10 Apr 2023 17:57:59 +0000 (+0200)
Subject: Simplify to include lower-case windows.h always, fix compile on mingw32 (#747)
X-Git-Tag: gguf-v0.4.0~995
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=d9a239c4104c888eafda672c1e42c9bbc5084cb8;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Simplify to include lower-case windows.h always, fix compile on mingw32 (#747)
---

diff --git a/ggml.c b/ggml.c
index 9616eb9f..a817f832 100644
--- a/ggml.c
+++ b/ggml.c
@@ -26,14 +26,9 @@
 #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;