vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify to include lower-case windows.h always, fix compilation on mingw32

Browse source
This commit is contained in:
Marco Matthies 2023-04-03 21:00:19 +02:00
parent 53dbba7695
commit f43aca0f63
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ggml.c
View file

@ -28,12 +28,7 @@
#if defined _MSC_VER || defined(__MINGW32__) #if defined _MSC_VER || defined(__MINGW32__)
#if !defined(__MINGW32__)
#include <Windows.h>
#else
// ref: https://github.com/ggerganov/whisper.cpp/issues/168
#include <windows.h> #include <windows.h>
#endif
typedef volatile LONG atomic_int; typedef volatile LONG atomic_int;
typedef atomic_int atomic_bool; typedef atomic_int atomic_bool;

2
llama.cpp
View file

@ -14,7 +14,7 @@
#if defined(_WIN32) && !defined(_POSIX_MAPPED_FILES) #if defined(_WIN32) && !defined(_POSIX_MAPPED_FILES)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <windows.h>
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <sys/mman.h> #include <sys/mman.h>