diff --git a/include/haproxy/cli.h b/include/haproxy/cli.h index 0a4433b69..31020430e 100644 --- a/include/haproxy/cli.h +++ b/include/haproxy/cli.h @@ -27,6 +27,7 @@ #include #include #include +#include #include diff --git a/include/haproxy/global.h b/include/haproxy/global.h index 547a2b8ce..a095a5268 100644 --- a/include/haproxy/global.h +++ b/include/haproxy/global.h @@ -24,7 +24,6 @@ #include #include -#include extern const char *build_features; extern struct global global; @@ -49,7 +48,6 @@ extern char *localpeer; extern unsigned int warned; /* bitfield of a few warnings to emit just once */ extern volatile unsigned long sleeping_thread_mask; extern struct list proc_list; /* list of process in mworker mode */ -extern struct mworker_proc *proc_self; /* process structure of current process */ extern int master; /* 1 if in master, 0 otherwise */ extern unsigned int rlim_fd_cur_at_boot; extern unsigned int rlim_fd_max_at_boot; diff --git a/include/haproxy/mworker.h b/include/haproxy/mworker.h index edc612ec3..434077c0c 100644 --- a/include/haproxy/mworker.h +++ b/include/haproxy/mworker.h @@ -17,6 +17,8 @@ #include #include +extern struct mworker_proc *proc_self; + void mworker_proc_list_to_env(); void mworker_env_to_proc_list(); diff --git a/src/haproxy.c b/src/haproxy.c index 3de53bfce..41715c105 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -252,8 +252,6 @@ unsigned int rlim_fd_max_at_boot = 0; /* per-boot randomness */ unsigned char boot_seed[20]; /* per-boot random seed (160 bits initially) */ -struct mworker_proc *proc_self = NULL; - static void *run_thread_poll_loop(void *data); /* bitfield of a few warnings to emit just once (WARN_*) */ diff --git a/src/mworker.c b/src/mworker.c index e3c579b57..b69c1adcb 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -42,6 +42,7 @@ static int exitcode = -1; static int max_reloads = -1; /* number max of reloads a worker can have until they are killed */ +struct mworker_proc *proc_self = NULL; /* process structure of current process */ /* ----- children processes handling ----- */