diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-23 15:13:12 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-23 15:13:12 +0400 |
| commit | c28ff717cb27e01cc40bdaebdd2c3826c0a7707d (patch) | |
| tree | f0cfcf4aac2d0fb1226b4305a90916998008436b /src/os | |
| parent | ae2f2b105ad8e56eea73720a094961cc9e665f3d (diff) | |
issue start up errors and warning on both stderr and error_log
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/unix/ngx_files.h | 6 | ||||
| -rw-r--r-- | src/os/unix/ngx_os.h | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_files.h | 5 | ||||
| -rw-r--r-- | src/os/win32/ngx_os.h | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_init.c | 1 |
5 files changed, 10 insertions, 4 deletions
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index c4d2b7f32..63d080b5c 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -273,8 +273,12 @@ ngx_int_t ngx_directio_off(ngx_fd_t fd); #endif - size_t ngx_fs_bsize(u_char *name); +#define ngx_stderr STDERR_FILENO +#define ngx_set_stderr(fd) dup2(fd, STDERR_FILENO) +#define ngx_set_stderr_n "dup2(STDERR_FILENO)" + + #endif /* _NGX_FILES_H_INCLUDED_ */ diff --git a/src/os/unix/ngx_os.h b/src/os/unix/ngx_os.h index a83c6ed8f..a8b6c6dc0 100644 --- a/src/os/unix/ngx_os.h +++ b/src/os/unix/ngx_os.h @@ -54,7 +54,6 @@ extern ngx_int_t ngx_max_sockets; extern ngx_uint_t ngx_inherited_nonblocking; extern ngx_uint_t ngx_tcp_nodelay_and_tcp_nopush; -#define ngx_stderr_fileno STDERR_FILENO #if (NGX_FREEBSD) #include <ngx_freebsd.h> diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h index 636d14c19..f3561d9b3 100644 --- a/src/os/win32/ngx_files.h +++ b/src/os/win32/ngx_files.h @@ -237,4 +237,9 @@ ngx_int_t ngx_directio_off(ngx_fd_t fd); size_t ngx_fs_bsize(u_char *name); +#define ngx_stderr GetStdHandle(STD_ERROR_HANDLE) +#define ngx_set_stderr(fd) SetStdHandle(STD_ERROR_HANDLE, fd) +#define ngx_set_stderr_n "SetStdHandle(STD_ERROR_HANDLE)" + + #endif /* _NGX_FILES_H_INCLUDED_ */ diff --git a/src/os/win32/ngx_os.h b/src/os/win32/ngx_os.h index ba10c809a..e72af3884 100644 --- a/src/os/win32/ngx_os.h +++ b/src/os/win32/ngx_os.h @@ -58,7 +58,6 @@ extern ngx_int_t ngx_max_sockets; extern ngx_uint_t ngx_inherited_nonblocking; extern ngx_uint_t ngx_tcp_nodelay_and_tcp_nopush; extern ngx_uint_t ngx_win32_version; -extern ngx_fd_t ngx_stderr_fileno; extern char ngx_unique[]; diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c index e64ce39fc..0924c3c70 100644 --- a/src/os/win32/ngx_win32_init.c +++ b/src/os/win32/ngx_win32_init.c @@ -16,7 +16,6 @@ ngx_int_t ngx_max_sockets; ngx_uint_t ngx_inherited_nonblocking = 1; ngx_uint_t ngx_tcp_nodelay_and_tcp_nopush; -ngx_fd_t ngx_stderr_fileno; char ngx_unique[NGX_INT32_LEN + 1]; |