From 41a58ce8dafe6d2ad5e0fec5e72dd29d71faaf4e Mon Sep 17 00:00:00 2001
From: Cebtenzzre <cebtenzzre@gmail.com>
Date: Wed, 30 Aug 2023 19:44:09 -0400
Subject: [PATCH] fix some MinGW warnings

---
 common/common.cpp | 6 ++++--
 llama.cpp         | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/common.cpp b/common/common.cpp
index ed09fc27d..41fc59ced 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -24,7 +24,9 @@
 
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
+#ifndef NOMINMAX
+#   define NOMINMAX
+#endif
 #include <codecvt>
 #include <locale>
 #include <windows.h>
@@ -1027,7 +1029,7 @@ void dump_non_result_info_yaml(FILE * stream, const gpt_params & params, const l
     dump_string_yaml_multiline(stream, "grammar", params.grammar.c_str());
     fprintf(stream, "grammar-file: # never logged, see grammar instead. Can still be specified for input.\n");
     fprintf(stream, "hellaswag: %s # default: false\n", params.hellaswag ? "true" : "false");
-    fprintf(stream, "hellaswag_tasks: %ld # default: 400\n", params.hellaswag_tasks);
+    fprintf(stream, "hellaswag_tasks: %zu # default: 400\n", params.hellaswag_tasks);
 
     const auto logit_bias_eos = params.logit_bias.find(llama_token_eos(lctx));
     const bool ignore_eos = logit_bias_eos != params.logit_bias.end() && logit_bias_eos->second == -INFINITY;
diff --git a/llama.cpp b/llama.cpp
index 81e41f7f7..7842724b9 100644
--- a/llama.cpp
+++ b/llama.cpp
@@ -623,6 +623,7 @@ struct llama_mmap {
             }
         }
         #else
+        (void)prefetch;
         #pragma message("warning: You are building for pre-Windows 8; prefetch not supported")
         #endif // _WIN32_WINNT >= _WIN32_WINNT_WIN8
     }