diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-10-21 19:34:38 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-21 19:34:38 +0400 |
| commit | c0edbcce58b03b89c70f1eb39cb44c74c4c7453a (patch) | |
| tree | 1ce72a5b51d724a0c054e079c2b1507ca85a145d /src/core/ngx_config.h | |
| parent | ac64333a44f39d5a658832517a106961f32f6aae (diff) | |
nginx-0.1.2-RELEASE importrelease-0.1.2
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS
options in configure.
*) Feature: the server_name directive supports *.domain.tld.
*) Bugfix: the portability improvements.
*) Bugfix: if configuration file was set in command line, the
reconfiguration was impossible; the bug had appeared in 0.1.1.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
*) Bugfix: with sendfile the response was not recoded according to the
charset module directives; the bug had appeared in 0.1.1.
*) Bugfix: very seldom bug in the kqueue processing.
*) Bugfix: the gzip module compressed the proxied responses that was
already compressed.
Diffstat (limited to 'src/core/ngx_config.h')
| -rw-r--r-- | src/core/ngx_config.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h index 7e3e6828c..3590fae7a 100644 --- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -8,30 +8,32 @@ #define _NGX_CONFIG_H_INCLUDED_ +#include <ngx_auto_headers.h> + + #if defined __DragonFly__ && !defined __FreeBSD__ #define __FreeBSD__ 4 #define __FreeBSD_version 480101 #endif -#if defined __FreeBSD__ +#if (NGX_FREEBSD) #include <ngx_freebsd_config.h> -#elif defined __linux__ +#elif (NGX_LINUX) #include <ngx_linux_config.h> - /* Solaris */ -#elif defined sun && (defined __svr4__ || defined __SVR4) +#elif (NGX_SOLARIS) #include <ngx_solaris_config.h> -#elif defined _WIN32 +#elif (NGX_WIN32) #include <ngx_win32_config.h> -#else /* posix */ +#else /* POSIX */ #include <ngx_posix_config.h> #endif @@ -89,8 +91,10 @@ typedef long ngx_flag_t; #define NGX_INT64_LEN sizeof("-9223372036854775808") - 1 #define NGX_OFF_T_LEN sizeof("-9223372036854775808") - 1 +#define NGX_MAX_INT_LEN (sizeof("-9223372036854775808") - 1) + -#if (SOLARIS) +#if (NGX_SOLARIS) /* TODO: auto_conf */ #define NGX_ALIGN (_MAX_ALIGNMENT - 1) /* platform word */ |