diff options
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__ */ |