diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-11-07 13:54:40 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-11-07 13:54:40 +0000 |
| commit | 1831fb16b7fd8c45e5fb012b06a82311eeae6061 (patch) | |
| tree | 3d9de72454f4a059e5da0b8c3d4abbd03959bc0f /src/core | |
| parent | ce87ce477e9c349fbff1d30e3a45a8f0cc928ef6 (diff) | |
| download | nginx-1831fb16b7fd8c45e5fb012b06a82311eeae6061.tar.gz nginx-1831fb16b7fd8c45e5fb012b06a82311eeae6061.tar.bz2 | |
r1355, r1471, r1600 merge:
make 64-bit ngx_int_t on 64-bit platforms
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_config.h | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h index ef31be538..a6a9f5d27 100644 --- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -70,31 +70,20 @@ #endif +typedef intptr_t ngx_int_t; +typedef uintptr_t ngx_uint_t; +typedef intptr_t ngx_flag_t; -/* TODO: platform specific: array[NGX_INVALID_ARRAY_INDEX] must cause SIGSEGV */ -#define NGX_INVALID_ARRAY_INDEX 0x80000000 - - -#if 1 -/* STUB: autoconf */ -typedef int ngx_int_t; -typedef u_int ngx_uint_t; -typedef int ngx_flag_t; -#define NGX_INT_T_LEN sizeof("-2147483648") - 1 +#define NGX_INT32_LEN sizeof("-2147483648") - 1 +#define NGX_INT64_LEN sizeof("-9223372036854775808") - 1 +#if (NGX_PTR_SIZE == 4) +#define NGX_INT_T_LEN NGX_INT32_LEN #else - -typedef long ngx_int_t; -typedef u_long ngx_uint_t; -typedef long ngx_flag_t; -#define NGX_INT_T_LEN sizeof("-9223372036854775808") - 1 - +#define NGX_INT_T_LEN NGX_INT64_LEN #endif -#define NGX_INT32_LEN sizeof("-2147483648") - 1 -#define NGX_INT64_LEN sizeof("-9223372036854775808") - 1 - #ifndef NGX_ALIGNMENT #define NGX_ALIGNMENT sizeof(unsigned long) /* platform word */ @@ -108,6 +97,10 @@ typedef long ngx_flag_t; #define ngx_abort abort +/* TODO: platform specific: array[NGX_INVALID_ARRAY_INDEX] must cause SIGSEGV */ +#define NGX_INVALID_ARRAY_INDEX 0x80000000 + + /* TODO: auto_conf: ngx_inline inline __inline __inline__ */ #ifndef ngx_inline #define ngx_inline inline |