diff options
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_alloc.c | 3 | ||||
| -rw-r--r-- | src/os/win32/ngx_alloc.h | 3 | ||||
| -rw-r--r-- | src/os/win32/ngx_errno.h | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_init.c | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/src/os/win32/ngx_alloc.c b/src/os/win32/ngx_alloc.c index 82ede7211..d04c3f37c 100644 --- a/src/os/win32/ngx_alloc.c +++ b/src/os/win32/ngx_alloc.c @@ -8,7 +8,8 @@ #include <ngx_core.h> -int ngx_pagesize; +ngx_uint_t ngx_pagesize; +ngx_uint_t ngx_pagesize_shift; ngx_uint_t ngx_cacheline_size; diff --git a/src/os/win32/ngx_alloc.h b/src/os/win32/ngx_alloc.h index 9d8d83750..805a41b3c 100644 --- a/src/os/win32/ngx_alloc.h +++ b/src/os/win32/ngx_alloc.h @@ -18,7 +18,8 @@ void *ngx_calloc(size_t size, ngx_log_t *log); #define ngx_free free #define ngx_memalign(alignment, size, log) ngx_alloc(size, log) -extern int ngx_pagesize; +extern ngx_uint_t ngx_pagesize; +extern ngx_uint_t ngx_pagesize_shift; extern ngx_uint_t ngx_cacheline_size; diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h index 5f1fab220..588d28879 100644 --- a/src/os/win32/ngx_errno.h +++ b/src/os/win32/ngx_errno.h @@ -21,6 +21,7 @@ typedef DWORD ngx_err_t; #define NGX_EPERM ERROR_ACCESS_DENIED #define NGX_ENOENT ERROR_FILE_NOT_FOUND +#define NGX_ENOMEM ERROR_NOT_ENOUGH_MEMORY #define NGX_EACCES ERROR_ACCESS_DENIED #if 0 #define NGX_EEXIST ERROR_FILE_EXISTS diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c index b4ac2b8b5..9c233c7b3 100644 --- a/src/os/win32/ngx_win32_init.c +++ b/src/os/win32/ngx_win32_init.c @@ -53,6 +53,7 @@ ngx_int_t ngx_os_init(ngx_log_t *log) DWORD bytes; SOCKET s; WSADATA wsd; + ngx_uint_t n; SYSTEM_INFO si; /* get Windows version */ @@ -101,6 +102,8 @@ ngx_int_t ngx_os_init(ngx_log_t *log) ngx_ncpu = si.dwNumberOfProcessors; ngx_cacheline_size = NGX_CPU_CACHE_LINE; + for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ } + /* init Winsock */ |