diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-02-06 17:21:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-02-06 17:21:13 +0000 |
| commit | 7300977320e04280c13d4d89a279f75af9c5f893 (patch) | |
| tree | 6c935b625eb2dbd83e71e5b2e23ac83bfd88aded /src/core/ngx_conf_file.h | |
| parent | 2a2d2b5094ee88dba5984eddfc4135b66bb8007e (diff) | |
| download | nginx-7300977320e04280c13d4d89a279f75af9c5f893.tar.gz nginx-7300977320e04280c13d4d89a279f75af9c5f893.zip | |
nginx-0.0.1-2003-02-06-20:21:13 import
Diffstat (limited to 'src/core/ngx_conf_file.h')
| -rw-r--r-- | src/core/ngx_conf_file.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index de85a74c8..9573ab9f2 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -83,6 +83,12 @@ struct ngx_conf_s { } +#define ngx_conf_size_merge(conf, prev, default) \ + if (conf == (size_t) NGX_CONF_UNSET) { \ + conf = (prev == (size_t) NGX_CONF_UNSET) ? default : prev; \ + } + + char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename); @@ -95,4 +101,4 @@ char *ngx_conf_set_time_slot(ngx_conf_t *cf, ngx_command_t *cmd, char *conf); extern ngx_module_t *ngx_modules[]; -#endif _NGX_HTTP_CONF_FILE_H_INCLUDED_ +#endif /* _NGX_HTTP_CONF_FILE_H_INCLUDED_ */ |