diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-03-04 17:06:57 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-03-04 17:06:57 +0300 |
commit | 8184d1b3a72c31e7e6492fc189d687ce85548279 (patch) | |
tree | 34e977c47f852d35117464b3cd5e82253fb4fa04 /src/core/ngx_config.h | |
parent | 7ad4a94eee3e17e073d6e8b638b7bd0a2209d2df (diff) |
nginx-0.1.24-RELEASE importrelease-0.1.24
*) Feature: the ngx_http_ssi_filter_module supports the QUERY_STRING
and DOCUMENT_URI variables.
*) Bugfix: the ngx_http_autoindex_module may some times return the 404
response for existent directory, if this directory was used in
"alias" directive.
*) Bugfix: the ngx_http_ssi_filter_module ran incorrectly for large
responses.
*) Bugfix: the lack of the "Referer" header line was always accounted
as valid referrer.
Diffstat (limited to 'src/core/ngx_config.h')
-rw-r--r-- | src/core/ngx_config.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h index dc791d406..bc02449dc 100644 --- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -92,20 +92,13 @@ typedef long ngx_flag_t; #if (NGX_SOLARIS) - -/* TODO: auto_conf */ -#define NGX_ALIGN (_MAX_ALIGNMENT - 1) /* platform word */ -#define NGX_ALIGN_CAST (unsigned long) /* size of the pointer */ - +#define NGX_ALIGN (_MAX_ALIGNMENT - 1) #else - /* TODO: auto_conf */ #define NGX_ALIGN (sizeof(unsigned long) - 1) /* platform word */ -#define NGX_ALIGN_CAST (unsigned long) /* size of the pointer */ - #endif -#define ngx_align(p) (u_char *) ((NGX_ALIGN_CAST p + NGX_ALIGN) & ~NGX_ALIGN) +#define ngx_align(p) (u_char *) (((uintptr_t) p + NGX_ALIGN) & ~NGX_ALIGN) /* TODO: auto_conf: ngx_inline inline __inline __inline__ */ |