From 2d3481c72125cd388258864c7ad8d7d36777bad7 Mon Sep 17 00:00:00 2001 From: nanahi <130121847+na-na-hi@users.noreply.github.com> Date: Sun, 16 Apr 2023 17:13:42 +0800 Subject: [PATCH] Fix msys2 build error and warnings (#1009) --- llama.cpp | 1 + llama_util.h | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/llama.cpp b/llama.cpp index be8c4cd..a0d7e51 100644 --- a/llama.cpp +++ b/llama.cpp @@ -9,6 +9,7 @@ #include "ggml.h" #include +#include #include #include #include diff --git a/llama_util.h b/llama_util.h index 653bf71..d2110eb 100755 --- a/llama_util.h +++ b/llama_util.h @@ -43,8 +43,12 @@ } while (0) #ifdef __GNUC__ +#ifdef __MINGW32__ +__attribute__((format(gnu_printf, 1, 2))) +#else __attribute__((format(printf, 1, 2))) #endif +#endif static std::string format(const char * fmt, ...) { va_list ap, ap2; va_start(ap, fmt); @@ -57,7 +61,7 @@ static std::string format(const char * fmt, ...) { va_end(ap2); va_end(ap); return std::string(buf.data(), size); -}; +} struct llama_file { // use FILE * so we don't have to re-open the file to mmap