diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-12-16 15:07:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-12-16 15:07:08 +0000 |
| commit | 2402502c2f35b831ee89369a532b1ff4e4e19947 (patch) | |
| tree | 37fb834956f497f8b2d2862c6c3514e1a25bfb37 /src/core/ngx_config.h | |
| parent | 74297c285ef173784cac505fd406267ac7c8d3c7 (diff) | |
| download | nginx-release-0.3.16.tar.gz nginx-release-0.3.16.tar.bz2 | |
nginx-0.3.16-RELEASE importrelease-0.3.16
*) Feature: the ngx_http_map_module.
*) Feature: the "types_hash_max_size" and "types_hash_bucket_size"
directives.
*) Feature: the "ssi_value_length" directive.
*) Feature: the "worker_rlimit_core" directive.
*) Workaround: the connection number in logs was always 1 if nginx was
built by the icc 8.1 or 9.0 compilers with optimization for
Pentium 4.
*) Bugfix: the "config timefmt" SSI command set incorrect time format.
*) Bugfix: nginx did not close connection to IMAP/POP3 backend for the
SSL connections; the bug had appeared in 0.3.13.
Thanks to Rob Mueller.
*) Bugfix: segmentation fault may occurred in at SSL shutdown; the bug
had appeared in 0.3.13.
Diffstat (limited to '')
| -rw-r--r-- | src/core/ngx_config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h index 96569b893..d924ec5e8 100644 --- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -98,8 +98,8 @@ typedef long ngx_flag_t; #define NGX_ALIGNMENT sizeof(unsigned long) /* platform word */ #endif -#define ngx_align(p) (u_char *) (((uintptr_t) p + (NGX_ALIGNMENT - 1)) \ - & ~(NGX_ALIGNMENT - 1)) +#define ngx_align(d, a) (((d) + (a - 1)) & ~(a - 1)) +#define ngx_align_ptr(p, a) (u_char *) (((uintptr_t) (p) + (a - 1)) & ~(a - 1)) #define ngx_abort abort |