From aa3436c04c222d57498bfa34c9fdec50f07fd08d Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 30 May 2003 14:27:59 +0000 Subject: nginx-0.0.1-2003-05-30-18:27:59 import --- src/os/unix/ngx_errno.h | 2 ++ src/os/win32/ngx_errno.c | 6 +++--- src/os/win32/ngx_files.h | 9 ++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/os') diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h index 6006471d9..91ac3ba69 100644 --- a/src/os/unix/ngx_errno.h +++ b/src/os/unix/ngx_errno.h @@ -24,7 +24,9 @@ typedef int ngx_err_t; #define ngx_socket_errno errno #define ngx_set_socket_errno(err) errno = err +#if 0 #define ngx_strerror(err) strerror(err) +#endif #define ngx_strerror_r(err, errstr, size) \ ngx_cpystrn(errstr, strerror(err), size) - (errstr) diff --git a/src/os/win32/ngx_errno.c b/src/os/win32/ngx_errno.c index ef91e883c..d0cff7b73 100644 --- a/src/os/win32/ngx_errno.c +++ b/src/os/win32/ngx_errno.c @@ -1,13 +1,13 @@ /* TODO: - add WSA error messages + add WSA error messages for NT and 98 test for English only messages */ #include -#include -#include +#include + int ngx_strerror_r(ngx_err_t err, char *errstr, size_t size) { diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h index 382136fe2..0fdad0f75 100644 --- a/src/os/win32/ngx_files.h +++ b/src/os/win32/ngx_files.h @@ -53,8 +53,8 @@ int ngx_file_type(char *filename, ngx_file_info_t *fi); #define ngx_file_type_n "GetFileAttributes" -#define ngx_stat_fd(fd, fi) GetFileInformationByHandle(fd, fi) -#define ngx_stat_fd_n "GetFileInformationByHandle" +#define ngx_stat_fd(fd, fi) GetFileInformationByHandle(fd, fi) +#define ngx_stat_fd_n "GetFileInformationByHandle" #define ngx_is_dir(fi) (fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) #define ngx_is_file(fi) !(fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) @@ -73,7 +73,10 @@ int ngx_file_type(char *filename, ngx_file_info_t *fi); ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset); -#define ngx_read_file_n "ReadFile()" +#define ngx_read_file_n "ReadFile()" + + +#define STDERR_FILENO (HANDLE) 2 #endif /* _NGX_FILES_H_INCLUDED_ */ -- cgit