diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-04 16:34:23 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-04 16:34:23 +0000 |
| commit | 6a9304522227d4b4df873d3716cf06093d497700 (patch) | |
| tree | bc6a3eb7d26df2048714235ce96b98471b813979 /src/os/win32 | |
| parent | a536298c7bd1f525db97facab814a2906214ee7f (diff) | |
| download | nginx-6a9304522227d4b4df873d3716cf06093d497700.tar.gz nginx-6a9304522227d4b4df873d3716cf06093d497700.tar.bz2 | |
nginx-0.0.2-2004-03-04-19:34:23 import
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_process.h | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/os/win32/ngx_process.h b/src/os/win32/ngx_process.h index 35d9bb904..c8587688b 100644 --- a/src/os/win32/ngx_process.h +++ b/src/os/win32/ngx_process.h @@ -21,7 +21,7 @@ typedef struct { #define NGX_PROCESS_WORKER 2 -ngx_pid_t ngx_exec(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx); +ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx); extern ngx_pid_t ngx_pid; diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index 00f6426e3..2af600d5e 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -40,10 +40,9 @@ #define ngx_inline __inline -#if 1 +#ifdef _MSC_VER typedef unsigned __int32 uint32_t; -#else -/* OWC has not __int32 */ +#else /* __WATCOMC__ */ typedef unsigned int uint32_t; #endif |