mirror of
https://github.com/nginx/nginx.git
synced 2024-11-23 20:19:02 +08:00
r1577, r1582 merge:
Cygwin support
This commit is contained in:
parent
67c3962364
commit
0993e097cf
@ -6,3 +6,5 @@ ngx_include="unistd.h"; . auto/include
|
||||
ngx_include="inttypes.h"; . auto/include
|
||||
ngx_include="limits.h"; . auto/include
|
||||
ngx_include="sys/filio.h"; . auto/include
|
||||
ngx_include="crypt.h"; . auto/include
|
||||
ngx_include="malloc.h"; . auto/include
|
||||
|
@ -19,6 +19,12 @@
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#define timezonevar /* timezone is variable */
|
||||
#define NGX_BROKEN_SCM_RIGHTS 1
|
||||
#endif
|
||||
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#if (NGX_HAVE_UNISTD_H)
|
||||
@ -64,6 +70,15 @@
|
||||
#include <limits.h> /* IOV_MAX */
|
||||
#endif
|
||||
|
||||
#if (NGX_HAVE_MALLOC_H)
|
||||
#include <malloc.h> /* memalign() */
|
||||
#endif
|
||||
|
||||
#if (NGX_HAVE_CRYPT_H)
|
||||
#include <crypt.h>
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef IOV_MAX
|
||||
#define IOV_MAX 16
|
||||
#endif
|
||||
|
@ -409,6 +409,12 @@ ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo)
|
||||
ngx_err_t err;
|
||||
ngx_channel_t ch;
|
||||
|
||||
#if (NGX_BROKEN_SCM_RIGHTS)
|
||||
|
||||
ch.command = 0;
|
||||
|
||||
#else
|
||||
|
||||
switch (signo) {
|
||||
|
||||
case ngx_signal_value(NGX_SHUTDOWN_SIGNAL):
|
||||
@ -427,6 +433,8 @@ ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo)
|
||||
ch.command = 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
ch.fd = -1;
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user