diff options
| author | Max Romanov <max.romanov@nginx.com> | 2017-08-30 12:08:29 -0700 |
|---|---|---|
| committer | Max Romanov <max.romanov@nginx.com> | 2017-08-30 12:08:29 -0700 |
| commit | d3f19d98cae610a9ddec9af5421f8af7c6663d9c (patch) | |
| tree | 25e34138facb922f5162c478750fccc868337eeb | |
| parent | a33145d614e9ea1d0c59cf219f50e36f879aa5bb (diff) | |
| download | unit-d3f19d98cae610a9ddec9af5421f8af7c6663d9c.tar.gz unit-d3f19d98cae610a9ddec9af5421f8af7c6663d9c.tar.bz2 | |
Avoid nxt_go_process_t redefinition warning.
| -rw-r--r-- | src/nginext/nxt_go_port_memory.h | 6 | ||||
| -rw-r--r-- | src/nginext/nxt_go_process.h | 3 | ||||
| -rw-r--r-- | src/nginext/nxt_go_run_ctx.h | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/nginext/nxt_go_port_memory.h b/src/nginext/nxt_go_port_memory.h index 0a1644ef..ca0cc967 100644 --- a/src/nginext/nxt_go_port_memory.h +++ b/src/nginext/nxt_go_port_memory.h @@ -12,7 +12,11 @@ #include <nxt_port_memory_int.h> typedef struct nxt_port_mmap_header_s nxt_port_mmap_header_t; -typedef struct nxt_go_process_s nxt_go_process_t; + +#ifndef _NXT_GO_PROCESS_T_DEFINED_ +#define _NXT_GO_PROCESS_T_DEFINED_ +typedef struct nxt_go_process_s nxt_go_process_t; +#endif nxt_port_mmap_header_t * nxt_go_port_mmap_get(nxt_go_process_t *process, nxt_port_id_t port_id, diff --git a/src/nginext/nxt_go_process.h b/src/nginext/nxt_go_process.h index 5e31fa6e..037844ce 100644 --- a/src/nginext/nxt_go_process.h +++ b/src/nginext/nxt_go_process.h @@ -11,7 +11,10 @@ #include <nxt_main.h> #include "nxt_go_mutex.h" +#ifndef _NXT_GO_PROCESS_T_DEFINED_ +#define _NXT_GO_PROCESS_T_DEFINED_ typedef struct nxt_go_process_s nxt_go_process_t; +#endif struct nxt_go_process_s { nxt_pid_t pid; diff --git a/src/nginext/nxt_go_run_ctx.h b/src/nginext/nxt_go_run_ctx.h index 62f6b133..a5a972c6 100644 --- a/src/nginext/nxt_go_run_ctx.h +++ b/src/nginext/nxt_go_run_ctx.h @@ -12,8 +12,10 @@ #include <nxt_application.h> #include <nxt_port_memory_int.h> - -typedef struct nxt_go_process_s nxt_go_process_t; +#ifndef _NXT_GO_PROCESS_T_DEFINED_ +#define _NXT_GO_PROCESS_T_DEFINED_ +typedef struct nxt_go_process_s nxt_go_process_t; +#endif typedef struct nxt_go_msg_s nxt_go_msg_t; |