diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-02-02 21:19:52 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-02-02 21:19:52 +0000 |
| commit | a4b16df728abe1e989a8311e901ba5d9ae30328e (patch) | |
| tree | 35d3d0ba37e1c285421688846c2954aa297a642c /src/os/unix | |
| parent | 328af6e8cd26f274bf385cfff3c888725746ea4f (diff) | |
| download | nginx-a4b16df728abe1e989a8311e901ba5d9ae30328e.tar.gz nginx-a4b16df728abe1e989a8311e901ba5d9ae30328e.zip | |
nginx-0.0.2-2004-02-03-00:19:52 import
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_aio_write_chain.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_errno.h | 1 | ||||
| -rw-r--r-- | src/os/unix/ngx_linux_config.h | 12 | ||||
| -rw-r--r-- | src/os/unix/ngx_process.c | 1 | ||||
| -rw-r--r-- | src/os/unix/ngx_process.h | 1 |
5 files changed, 6 insertions, 11 deletions
diff --git a/src/os/unix/ngx_aio_write_chain.c b/src/os/unix/ngx_aio_write_chain.c index 73150447f..4146d4f7d 100644 --- a/src/os/unix/ngx_aio_write_chain.c +++ b/src/os/unix/ngx_aio_write_chain.c @@ -58,7 +58,7 @@ ngx_chain_t *ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in) } #if (NGX_DEBUG_WRITE_CHAIN) - ngx_log_debug(c->log, "aio_write sent: " OFF_FMT _ c->sent); + ngx_log_debug(c->log, "aio_write sent: " OFF_T_FMT _ c->sent); #endif for (cl = in; cl; cl = cl->next) { diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h index 1542456f8..208faa244 100644 --- a/src/os/unix/ngx_errno.h +++ b/src/os/unix/ngx_errno.h @@ -19,6 +19,7 @@ typedef int ngx_err_t; #define NGX_EAGAIN EWOULDBLOCK #define NGX_EINPROGRESS EINPROGRESS #define NGX_EADDRINUSE EADDRINUSE +#define NGX_ECONNABORTED ECONNABORTED #define NGX_ECONNRESET ECONNRESET #define NGX_ENOTCONN ENOTCONN #define NGX_ETIMEDOUT ETIMEDOUT diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h index de3f2871e..e43a6caa7 100644 --- a/src/os/unix/ngx_linux_config.h +++ b/src/os/unix/ngx_linux_config.h @@ -55,6 +55,10 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size); #include <poll.h> #endif +#if (HAVE_EPOLL) +#include <sys/epoll.h> +#endif /* HAVE_EPOLL */ + #if defined TCP_DEFER_ACCEPT && !defined HAVE_DEFERRED_ACCEPT #define HAVE_DEFERRED_ACCEPT 1 @@ -76,14 +80,6 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size); #endif -/* - * SuSE 8.2 supports epoll's EPOLLET but misses it in <sys/epoll.h> - */ -#ifndef EPOLLET -#define EPOLLET 0x80000000 -#endif - - #define ngx_setproctitle(title) diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index bad9a324c..68bdaed7b 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -70,7 +70,6 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, (respawn == NGX_PROCESS_RESPAWN) ? 1 : 0; ngx_processes[ngx_last_process].detached = (respawn == NGX_PROCESS_DETACHED) ? 1 : 0; - ngx_processes[ngx_last_process].signal = 0; ngx_processes[ngx_last_process].exited = 0; ngx_processes[ngx_last_process].exiting = 0; ngx_last_process++; diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h index 195d3fd75..a1aa74bd7 100644 --- a/src/os/unix/ngx_process.h +++ b/src/os/unix/ngx_process.h @@ -8,7 +8,6 @@ typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data); typedef struct { ngx_pid_t pid; - int signal; int status; ngx_spawn_proc_pt proc; |