Mercurial > hg > nginx-mail
comparison src/core/ngx_conf_file.h @ 665:0b460e61bdcd default tip
Merge with nginx 1.0.0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:22:17 +0400 |
parents | da3c99095432 |
children |
comparison
equal
deleted
inserted
replaced
572:06419a2298a9 | 665:0b460e61bdcd |
---|---|
320 | 320 |
321 ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, | 321 ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, |
322 ngx_uint_t conf_prefix); | 322 ngx_uint_t conf_prefix); |
323 ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name); | 323 ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name); |
324 void ngx_cdecl ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, | 324 void ngx_cdecl ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, |
325 ngx_err_t err, char *fmt, ...); | 325 ngx_err_t err, const char *fmt, ...); |
326 | 326 |
327 | 327 |
328 char *ngx_conf_set_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 328 char *ngx_conf_set_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
329 char *ngx_conf_set_str_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | 329 char *ngx_conf_set_str_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
330 char *ngx_conf_set_str_array_slot(ngx_conf_t *cf, ngx_command_t *cmd, | 330 char *ngx_conf_set_str_array_slot(ngx_conf_t *cf, ngx_command_t *cmd, |