happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix windows build

This commit is contained in:
Xuan Son Nguyen 2025-11-19 22:30:47 +01:00
parent abc0ca478a
commit 54b3545791
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/server/server-models.cpp
View File

@ -210,7 +210,7 @@ void server_models::load(const std::string & name) {
inst.meta.port = get_free_port(base_params.hostname); inst.meta.port = get_free_port(base_params.hostname);
inst.meta.status = SERVER_MODEL_STATUS_LOADING; inst.meta.status = SERVER_MODEL_STATUS_LOADING;
process_handle_t child_pid = SERVER_DEFAULT_PID; PROCESS_HANDLE_T child_pid = SERVER_DEFAULT_PID;
{ {
std::string exec_path = get_server_exec_path().string(); std::string exec_path = get_server_exec_path().string();
SRV_INF("spawning server instance with name=%s on port %d\n", inst.meta.name.c_str(), inst.meta.port); SRV_INF("spawning server instance with name=%s on port %d\n", inst.meta.name.c_str(), inst.meta.port);

16
tools/server/server-models.h
View File

@ -7,17 +7,19 @@
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
// pid_t is defined in <sys/types.h> on POSIX systems. On Windows, this
// header doesn't exist and the server code is not expected to build/run,
// but provide a minimal fallback typedef to avoid include errors when this
// header is parsed in non-POSIX builds.
#if defined(_WIN32) #if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
# define NOMINMAX
#endif
#include <windows.h>
#define SERVER_DEFAULT_PID NULL #define SERVER_DEFAULT_PID NULL
using process_handle_t = HANDLE; #define PROCESS_HANDLE_T HANDLE
#else #else
#include <sys/types.h> #include <sys/types.h>
#define SERVER_DEFAULT_PID 0 #define SERVER_DEFAULT_PID 0
using process_handle_t = pid_t; #define PROCESS_HANDLE_T pid_t
#endif #endif
enum server_model_status { enum server_model_status {
@ -63,7 +65,7 @@ struct server_model_meta {
struct server_models { struct server_models {
private: private:
struct instance_t { struct instance_t {
process_handle_t pid = SERVER_DEFAULT_PID; PROCESS_HANDLE_T pid = SERVER_DEFAULT_PID;
std::thread th; std::thread th;
server_model_meta meta; server_model_meta meta;
}; };