diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2015-12-03 20:06:45 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2015-12-03 20:06:45 +0300 |
| commit | 699459347832fc57ab8ba9aefa11d3b2ec5385b0 (patch) | |
| tree | 4c83a6987bf7a16722d7559c32f10de06003d845 | |
| parent | af4e89b9a18a6bfece623d31a8b4cc6160f847cd (diff) | |
Style: NGX_PTR_SIZE replaced with sizeof(void *).
The NGX_PTR_SIZE macro is only needed in preprocessor directives where
it's not possible to use sizeof().
| -rw-r--r-- | src/core/ngx_string.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c index d2a8d011..cf665a4e 100644 --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -410,7 +410,7 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args) hex = 2; sign = 0; zero = '0'; - width = NGX_PTR_SIZE * 2; + width = 2 * sizeof(void *); break; case 'c': diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index acb9c909..4b8dd4c9 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3503,7 +3503,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) /* TODO: it does not merge, it inits only */ ngx_conf_merge_size_value(conf->connection_pool_size, - prev->connection_pool_size, NGX_PTR_SIZE * 64); + prev->connection_pool_size, 64 * sizeof(void *)); ngx_conf_merge_size_value(conf->request_pool_size, prev->request_pool_size, 4096); ngx_conf_merge_msec_value(conf->client_header_timeout, |