diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-02-22 14:40:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-02-22 14:40:13 +0000 |
| commit | d039a2e193c9172e4f415b9304222e81804a69d0 (patch) | |
| tree | 4571d4da7950e9464e788a4d68dc5111167de52c /src/os/win32 | |
| parent | 174db74f2309e28c0e2b54e89b9e08afff187c7c (diff) | |
| download | nginx-release-0.1.21.tar.gz nginx-release-0.1.21.tar.bz2 | |
nginx-0.1.21-RELEASE importrelease-0.1.21
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
if "rtsig" method was used or if several worker process ran on SMP.
*) Bugfix: nginx could not be built by the icc compiler on Linux or if
the zlib-1.2.x library was building from sources.
*) Bugfix: nginx could not be built on NetBSD 2.0.
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_atomic.h | 5 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/os/win32/ngx_atomic.h b/src/os/win32/ngx_atomic.h index b4915d0a2..7022bfae8 100644 --- a/src/os/win32/ngx_atomic.h +++ b/src/os/win32/ngx_atomic.h @@ -14,8 +14,13 @@ #define NGX_HAVE_ATOMIC_OPS 1 +typedef uint32_t ngx_atomic_int_t; +typedef volatile ngx_atomic_int_t ngx_atomic_t; +#define NGX_ATOMIC_T_LEN sizeof("-2147483648") - 1 + #define ngx_atomic_inc(p) InterlockedIncrement((long *) p) +#define ngx_atomic_dec(p) InterlockedDecrement((long *) p) #if defined( __WATCOMC__ ) || defined( __BORLANDC__ ) || ( _MSC_VER >= 1300 ) diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index 7c3bcd5fa..5bdf91f66 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -111,7 +111,6 @@ typedef __int64 off_t; typedef uint32_t in_addr_t; typedef u_short in_port_t; typedef int sig_atomic_t; -typedef uint32_t ngx_atomic_t; #define NGX_SIZE_T_LEN sizeof("-2147483648") - 1 |