# HG changeset patch # User Maxim Dounin # Date 1449162405 -10800 # Node ID fcbac620ae83c9e1e0847086f7841da13615fec2 # Parent be3aed17689c0edd36c2025ff5c36fe493b68bd7 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(). diff -r be3aed17689c -r fcbac620ae83 src/core/ngx_string.c --- a/src/core/ngx_string.c Wed Dec 02 01:06:54 2015 +0300 +++ b/src/core/ngx_string.c Thu Dec 03 20:06:45 2015 +0300 @@ -410,7 +410,7 @@ hex = 2; sign = 0; zero = '0'; - width = NGX_PTR_SIZE * 2; + width = 2 * sizeof(void *); break; case 'c': diff -r be3aed17689c -r fcbac620ae83 src/http/ngx_http_core_module.c --- a/src/http/ngx_http_core_module.c Wed Dec 02 01:06:54 2015 +0300 +++ b/src/http/ngx_http_core_module.c Thu Dec 03 20:06:45 2015 +0300 @@ -3503,7 +3503,7 @@ /* 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,