diff options
Diffstat (limited to 'src/http/ngx_http.h')
-rw-r--r-- | src/http/ngx_http.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h index 08bea5964..b717c8032 100644 --- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -126,9 +126,9 @@ void ngx_http_test_reading(ngx_http_request_t *r); char *ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); -char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t *keys, - ngx_hash_t *types_hash, ngx_array_t *prev_keys, ngx_hash_t *prev_types_hash, - ngx_str_t *default_types); +char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t **keys, + ngx_hash_t *types_hash, ngx_array_t **prev_keys, + ngx_hash_t *prev_types_hash, ngx_str_t *default_types); ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, ngx_str_t *default_type); |