Fix msys2 build error and warnings (#1009)

This commit is contained in:
nanahi 2023-04-16 17:13:42 +08:00 committed by GitHub
parent 74f5899df4
commit 2d3481c721
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View file

@ -9,6 +9,7 @@
#include "ggml.h" #include "ggml.h"
#include <array> #include <array>
#include <ctime>
#include <cinttypes> #include <cinttypes>
#include <fstream> #include <fstream>
#include <random> #include <random>

View file

@ -43,8 +43,12 @@
} while (0) } while (0)
#ifdef __GNUC__ #ifdef __GNUC__
#ifdef __MINGW32__
__attribute__((format(gnu_printf, 1, 2)))
#else
__attribute__((format(printf, 1, 2))) __attribute__((format(printf, 1, 2)))
#endif #endif
#endif
static std::string format(const char * fmt, ...) { static std::string format(const char * fmt, ...) {
va_list ap, ap2; va_list ap, ap2;
va_start(ap, fmt); va_start(ap, fmt);
@ -57,7 +61,7 @@ static std::string format(const char * fmt, ...) {
va_end(ap2); va_end(ap2);
va_end(ap); va_end(ap);
return std::string(buf.data(), size); return std::string(buf.data(), size);
}; }
struct llama_file { struct llama_file {
// use FILE * so we don't have to re-open the file to mmap // use FILE * so we don't have to re-open the file to mmap