technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed building on Solaris by Sun C.

Browse Source
This commit is contained in:
Max Romanov
2017-07-25 16:18:31 +03:00
parent 578cd547c0
commit 316c77a9de
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nxt_application.h
View File

@@ -101,7 +101,7 @@ typedef struct {
} nxt_app_request_t; } nxt_app_request_t;
//typedef struct nxt_app_parse_ctx_s nxt_app_parse_ctx_t; typedef struct nxt_app_parse_ctx_s nxt_app_parse_ctx_t;
struct nxt_app_parse_ctx_s { struct nxt_app_parse_ctx_s {
nxt_app_request_t r; nxt_app_request_t r;

4
src/nxt_conf.c
View File

@@ -41,7 +41,7 @@ typedef struct nxt_conf_array_s nxt_conf_array_t;
typedef struct nxt_conf_object_s nxt_conf_object_t; typedef struct nxt_conf_object_s nxt_conf_object_t;
struct nxt_aligned(8) nxt_conf_value_s { struct nxt_conf_value_s {
union nxt_packed { union nxt_packed {
uint8_t boolean; /* 1 bit. */ uint8_t boolean; /* 1 bit. */
int64_t integer; int64_t integer;
@@ -62,7 +62,7 @@ struct nxt_aligned(8) nxt_conf_value_s {
} u; } u;
uint8_t type; /* 3 bits. */ uint8_t type; /* 3 bits. */
}; } nxt_aligned(8);
struct nxt_conf_array_s { struct nxt_conf_array_s {

8
src/nxt_conf_validation.c
View File

@@ -37,12 +37,12 @@ static nxt_conf_vldt_object_t nxt_conf_vldt_root_members[] = {
{ nxt_string("listeners"), { nxt_string("listeners"),
NXT_CONF_OBJECT, NXT_CONF_OBJECT,
&nxt_conf_vldt_object_iterator, &nxt_conf_vldt_object_iterator,
&nxt_conf_vldt_listener }, (void *) &nxt_conf_vldt_listener },
{ nxt_string("applications"), { nxt_string("applications"),
NXT_CONF_OBJECT, NXT_CONF_OBJECT,
&nxt_conf_vldt_object_iterator, &nxt_conf_vldt_object_iterator,
&nxt_conf_vldt_app }, (void *) &nxt_conf_vldt_app },
{ nxt_null_string, 0, NULL, NULL } { nxt_null_string, 0, NULL, NULL }
}; };
@@ -301,7 +301,7 @@ nxt_conf_vldt_object_iterator(nxt_conf_value_t *conf, nxt_conf_value_t *value,
nxt_conf_value_t *member; nxt_conf_value_t *member;
nxt_conf_vldt_member_t validator; nxt_conf_vldt_member_t validator;
validator = data; validator = (nxt_conf_vldt_member_t) data;
index = 0; index = 0;
for ( ;; ) { for ( ;; ) {
@@ -315,6 +315,4 @@ nxt_conf_vldt_object_iterator(nxt_conf_value_t *conf, nxt_conf_value_t *value,
return NXT_ERROR; return NXT_ERROR;
} }
} }
return NXT_OK;
} }

1
src/nxt_conn.h
View File

@@ -183,7 +183,6 @@ struct nxt_conn_s {
typedef uint32_t nxt_req_id_t; typedef uint32_t nxt_req_id_t;
typedef struct nxt_app_parse_ctx_s nxt_app_parse_ctx_t;
typedef struct { typedef struct {
nxt_req_id_t req_id; nxt_req_id_t req_id;

5
src/nxt_router.c
View File

@@ -382,12 +382,13 @@ nxt_router_conf_data_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg)
b->mem.pos = b->mem.free; b->mem.pos = b->mem.free;
if (ret == NXT_OK) { if (ret == NXT_OK) {
return nxt_router_conf_success(task, tmcf); nxt_router_conf_success(task, tmcf);
return;
} }
nxt_log(task, NXT_LOG_CRIT, "failed to apply new conf"); nxt_log(task, NXT_LOG_CRIT, "failed to apply new conf");
return nxt_router_conf_error(task, tmcf); nxt_router_conf_error(task, tmcf);
} }