make 64-bit ngx_int_t on 64-bit platforms

diff --git a/auto/types/uintptr_t b/auto/types/uintptr_t
index e7d8d5ca0bab4567f28da15adf63ef6265f40212..55024b820feed7f87b59e93b29805ef08fef28b4 100644 (file)
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@@ -36,5 +36,6 @@ if [ $found = no ]; then
     found="uint`expr 8 \* $ngx_ptr_size`_t"
     echo ", $found used"
 
-    echo "typedef $found  uintptr_t;"   >> $NGX_AUTO_CONFIG_H
+    echo "typedef $found  uintptr_t;"                   >> $NGX_AUTO_CONFIG_H
+    echo "typedef $found  intptr_t;" | sed -e 's/u//g'  >> $NGX_AUTO_CONFIG_H
 fi

diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
index ef31be53866b9606ae9cefff56b6cfc883752371..a6a9f5d277cc16d397a1cd088f01035de69f7962 100644 (file)
--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
@@ -70,31 +70,20 @@
 
 #endif
 
+typedef intptr_t        ngx_int_t;
+typedef uintptr_t       ngx_uint_t;
+typedef intptr_t        ngx_flag_t;
 
 
-/* TODO: platform specific: array[NGX_INVALID_ARRAY_INDEX] must cause SIGSEGV */
-#define NGX_INVALID_ARRAY_INDEX 0x80000000
-
-
-#if 1
-/* STUB: autoconf */
-typedef int             ngx_int_t;
-typedef u_int           ngx_uint_t;
-typedef int             ngx_flag_t;
-#define NGX_INT_T_LEN   sizeof("-2147483648") - 1
+#define NGX_INT32_LEN   sizeof("-2147483648") - 1
+#define NGX_INT64_LEN   sizeof("-9223372036854775808") - 1
 
+#if (NGX_PTR_SIZE == 4)
+#define NGX_INT_T_LEN   NGX_INT32_LEN
 #else
-
-typedef long            ngx_int_t;
-typedef u_long          ngx_uint_t;
-typedef long            ngx_flag_t;
-#define NGX_INT_T_LEN   sizeof("-9223372036854775808") - 1
-
+#define NGX_INT_T_LEN   NGX_INT64_LEN
 #endif
 
-#define NGX_INT32_LEN   sizeof("-2147483648") - 1
-#define NGX_INT64_LEN   sizeof("-9223372036854775808") - 1
-
 
 #ifndef NGX_ALIGNMENT
 #define NGX_ALIGNMENT   sizeof(unsigned long)    /* platform word */
@@ -108,6 +97,10 @@ typedef long            ngx_flag_t;
 #define ngx_abort       abort
 
 
+/* TODO: platform specific: array[NGX_INVALID_ARRAY_INDEX] must cause SIGSEGV */
+#define NGX_INVALID_ARRAY_INDEX 0x80000000
+
+
 /* TODO: auto_conf: ngx_inline   inline __inline __inline__ */
 #ifndef ngx_inline
 #define ngx_inline      inline

diff --git a/src/event/modules/ngx_aio_module.c b/src/event/modules/ngx_aio_module.c
index 1022643e85320deb2a7ddf200c3a26ad60cc279a..4a78c3991bb7ddf814cdc82209b6d91abd353c05 100644 (file)
--- a/src/event/modules/ngx_aio_module.c
+++ b/src/event/modules/ngx_aio_module.c
@@ -16,9 +16,11 @@
 
 static ngx_int_t ngx_aio_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static void ngx_aio_done(ngx_cycle_t *cycle);
-static ngx_int_t ngx_aio_add_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_aio_del_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_aio_del_connection(ngx_connection_t *c, u_int flags);
+static ngx_int_t ngx_aio_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_aio_del_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_aio_del_connection(ngx_connection_t *c, ngx_uint_t flags);
 static ngx_int_t ngx_aio_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_uint_t flags);
 
@@ -100,21 +102,21 @@ ngx_aio_done(ngx_cycle_t *cycle)
 /* the event adding and deleting are needed for the listening sockets */
 
 static ngx_int_t
-ngx_aio_add_event(ngx_event_t *ev, int event, u_int flags)
+ngx_aio_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     return ngx_kqueue_module_ctx.actions.add(ev, event, flags);
 }
 
 
 static ngx_int_t
-ngx_aio_del_event(ngx_event_t *ev, int event, u_int flags)
+ngx_aio_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     return ngx_kqueue_module_ctx.actions.del(ev, event, flags);
 }
 
 
 static ngx_int_t
-ngx_aio_del_connection(ngx_connection_t *c, u_int flags)
+ngx_aio_del_connection(ngx_connection_t *c, ngx_uint_t flags)
 {
     int  rc;
 

diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index d7ea99b0c4a20c92ff0ef0031d216a36945b2cf6..be523add96f36fa21a1dfae6ddccf389a5a1169b 100644 (file)
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -13,8 +13,8 @@
 
 /* Solaris declarations */
 
-#define POLLREMOVE   0x0800
-#define DP_POLL      0xD001
+#define POLLREMOVE  0x0800
+#define DP_POLL     0xD001
 
 struct dvpoll {
     struct pollfd  *dp_fds;
@@ -26,16 +26,19 @@ struct dvpoll {
 
 
 typedef struct {
-    u_int  changes;
-    u_int  events;
+    ngx_uint_t      changes;
+    ngx_uint_t      events;
 } ngx_devpoll_conf_t;
 
 
 static ngx_int_t ngx_devpoll_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static void ngx_devpoll_done(ngx_cycle_t *cycle);
-static ngx_int_t ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_devpoll_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_devpoll_del_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_devpoll_set_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
 static ngx_int_t ngx_devpoll_process_events(ngx_cycle_t *cycle,
     ngx_msec_t timer, ngx_uint_t flags);
 
@@ -44,7 +47,7 @@ static char *ngx_devpoll_init_conf(ngx_cycle_t *cycle, void *conf);
 
 static int              dp = -1;
 static struct pollfd   *change_list, *event_list;
-static u_int            nchanges, max_changes, nevents;
+static ngx_uint_t       nchanges, max_changes, nevents;
 
 static ngx_event_t    **change_index;
 
@@ -208,7 +211,7 @@ ngx_devpoll_done(ngx_cycle_t *cycle)
 
 
 static ngx_int_t
-ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags)
+ngx_devpoll_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
 #if (NGX_DEBUG)
     ngx_connection_t *c;
@@ -221,7 +224,7 @@ ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags)
 #if (NGX_DEBUG)
     c = ev->data;
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "devpoll add event: fd:%d ev:%04Xd", c->fd, event);
+                   "devpoll add event: fd:%d ev:%04Xi", c->fd, event);
 #endif
 
     ev->active = 1;
@@ -231,7 +234,7 @@ ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags)
 
 
 static ngx_int_t
-ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
+ngx_devpoll_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     ngx_event_t       *e;
     ngx_connection_t  *c;
@@ -243,7 +246,7 @@ ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
 #endif
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "devpoll del event: fd:%d ev:%04Xd", c->fd, event);
+                   "devpoll del event: fd:%d ev:%04Xi", c->fd, event);
 
     if (ngx_devpoll_set_event(ev, POLLREMOVE, flags) == NGX_ERROR) {
         return NGX_ERROR;
@@ -275,7 +278,7 @@ ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
 
 
 static ngx_int_t
-ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags)
+ngx_devpoll_set_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     size_t             n;
     ngx_connection_t  *c;
@@ -283,7 +286,7 @@ ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags)
     c = ev->data;
 
     ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "devpoll fd:%d ev:%04Xd fl:%04Xd", c->fd, event, flags);
+                   "devpoll fd:%d ev:%04Xi fl:%04Xi", c->fd, event, flags);
 
     if (nchanges >= max_changes) {
         ngx_log_error(NGX_LOG_WARN, ev->log, 0,
@@ -300,7 +303,7 @@ ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags)
     }
 
     change_list[nchanges].fd = c->fd;
-    change_list[nchanges].events = event;
+    change_list[nchanges].events = (short) event;
     change_list[nchanges].revents = 0;
 
     change_index[nchanges] = ev;
@@ -353,7 +356,7 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     }
 
     dvp.dp_fds = event_list;
-    dvp.dp_nfds = nevents;
+    dvp.dp_nfds = (int) nevents;
     dvp.dp_timeout = timer;
     events = ioctl(dp, DP_POLL, &dvp);
 

diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index 184346abfbed6421879831d884e37faee39dcf5a..432164bc4fb5d1bff5f37408e78b65a28dab05c3 100644 (file)
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -66,16 +66,19 @@ int epoll_wait(int epfd, struct epoll_event *events, int nevents, int timeout)
 
 
 typedef struct {
-    u_int  events;
+    ngx_uint_t  events;
 } ngx_epoll_conf_t;
 
 
 static ngx_int_t ngx_epoll_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static void ngx_epoll_done(ngx_cycle_t *cycle);
-static ngx_int_t ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_epoll_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_epoll_del_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
 static ngx_int_t ngx_epoll_add_connection(ngx_connection_t *c);
-static ngx_int_t ngx_epoll_del_connection(ngx_connection_t *c, u_int flags);
+static ngx_int_t ngx_epoll_del_connection(ngx_connection_t *c,
+    ngx_uint_t flags);
 static ngx_int_t ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_uint_t flags);
 
@@ -84,7 +87,7 @@ static char *ngx_epoll_init_conf(ngx_cycle_t *cycle, void *conf);
 
 static int                  ep = -1;
 static struct epoll_event  *event_list;
-static u_int                nevents;
+static ngx_uint_t           nevents;
 
 
 static ngx_str_t      epoll_name = ngx_string("epoll");
@@ -205,7 +208,7 @@ ngx_epoll_done(ngx_cycle_t *cycle)
 
 
 static ngx_int_t
-ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags)
+ngx_epoll_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     int                  op;
     uint32_t             events, prev;
@@ -240,7 +243,7 @@ ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags)
         op = EPOLL_CTL_ADD;
     }
 
-    ee.events = events | flags;
+    ee.events = events | (uint32_t) flags;
     ee.data.ptr = (void *) ((uintptr_t) c | ev->instance);
 
     ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
@@ -263,7 +266,7 @@ ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags)
 
 
 static ngx_int_t
-ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
+ngx_epoll_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     int                  op;
     uint32_t             prev;
@@ -295,7 +298,7 @@ ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
 
     if (e->active) {
         op = EPOLL_CTL_MOD;
-        ee.events = prev | flags;
+        ee.events = prev | (uint32_t) flags;
         ee.data.ptr = (void *) ((uintptr_t) c | ev->instance);
 
     } else {
@@ -345,10 +348,10 @@ ngx_epoll_add_connection(ngx_connection_t *c)
 
 
 static ngx_int_t
-ngx_epoll_del_connection(ngx_connection_t *c, u_int flags)
+ngx_epoll_del_connection(ngx_connection_t *c, ngx_uint_t flags)
 {
-    int                  op;
-    struct epoll_event   ee;
+    int                 op;
+    struct epoll_event  ee;
 
     /*
      * when the file descriptor is closed the epoll automatically deletes
@@ -399,7 +402,7 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                    "epoll timer: %M", timer);
 
-    events = epoll_wait(ep, event_list, nevents, timer);
+    events = epoll_wait(ep, event_list, (int) nevents, timer);
 
     if (events == -1) {
         err = ngx_errno;

diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c
index 0abb2eec1ef804874c24215f61a95060025c8fd6..85cd1958d07bc30a3ac65ff5a2e5c60a5bca8df0 100644 (file)
--- a/src/event/modules/ngx_eventport_module.c
+++ b/src/event/modules/ngx_eventport_module.c
@@ -40,9 +40,9 @@ typedef struct  port_notify {
     void       *portnfy_user;   /* user defined */
 } port_notify_t;
 
-typedef struct itimerspec {         /* definition per POSIX.4 */
-    struct timespec it_interval;    /* timer period */
-    struct timespec it_value;       /* timer expiration */
+typedef struct itimerspec {     /* definition per POSIX.4 */
+    struct timespec it_interval;/* timer period */
+    struct timespec it_value;   /* timer expiration */
 } itimerspec_t;
 
 int port_create(void)
@@ -87,16 +87,16 @@ int timer_delete(timer_t timerid)
 
 
 typedef struct {
-    u_int  events;
+    ngx_uint_t  events;
 } ngx_eventport_conf_t;
 
 
 static ngx_int_t ngx_eventport_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static void ngx_eventport_done(ngx_cycle_t *cycle);
-static ngx_int_t ngx_eventport_add_event(ngx_event_t *ev, int event,
-    u_int flags);
-static ngx_int_t ngx_eventport_del_event(ngx_event_t *ev, int event,
-    u_int flags);
+static ngx_int_t ngx_eventport_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_eventport_del_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
 static ngx_int_t ngx_eventport_process_events(ngx_cycle_t *cycle,
     ngx_msec_t timer, ngx_uint_t flags);
 
@@ -105,7 +105,7 @@ static char *ngx_eventport_init_conf(ngx_cycle_t *cycle, void *conf);
 
 static int            ep = -1;
 static port_event_t  *event_list;
-static u_int          nevents;
+static ngx_uint_t     nevents;
 static timer_t        event_timer = -1;
 
 static ngx_str_t      eventport_name = ngx_string("eventport");
@@ -261,9 +261,9 @@ ngx_eventport_done(ngx_cycle_t *cycle)
 
 
 static ngx_int_t
-ngx_eventport_add_event(ngx_event_t *ev, int event, u_int flags)
+ngx_eventport_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
-    int                events, prev;
+    ngx_int_t          events, prev;
     ngx_event_t       *e;
     ngx_connection_t  *c;
 
@@ -291,7 +291,7 @@ ngx_eventport_add_event(ngx_event_t *ev, int event, u_int flags)
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "eventport add event: fd:%d ev:%04Xd", c->fd, events);
+                   "eventport add event: fd:%d ev:%04Xi", c->fd, events);
 
     if (port_associate(ep, PORT_SOURCE_FD, c->fd, events,
                        (void *) ((uintptr_t) ev | ev->instance))
@@ -310,7 +310,7 @@ ngx_eventport_add_event(ngx_event_t *ev, int event, u_int flags)
 
 
 static ngx_int_t
-ngx_eventport_del_event(ngx_event_t *ev, int event, u_int flags)
+ngx_eventport_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     ngx_event_t       *e;
     ngx_connection_t  *c;
@@ -340,7 +340,7 @@ ngx_eventport_del_event(ngx_event_t *ev, int event, u_int flags)
 
     if (e->oneshot) {
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                       "eventport change event: fd:%d ev:%04Xd", c->fd, event);
+                       "eventport change event: fd:%d ev:%04Xi", c->fd, event);
 
         if (port_associate(ep, PORT_SOURCE_FD, c->fd, event,
                            (void *) ((uintptr_t) ev | ev->instance))
@@ -396,7 +396,7 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
 
     events = 1;
 
-    n = port_getn(ep, event_list, nevents, &events, tp);
+    n = port_getn(ep, event_list, (u_int) nevents, &events, tp);
 
     err = ngx_errno;
 

diff --git a/src/event/modules/ngx_iocp_module.c b/src/event/modules/ngx_iocp_module.c
index c9f4f0c05115f6c1abb7e2e186ed322824319da8..576ce1aaebe21b69501ec2c3f4be702ca3441075 100644 (file)
--- a/src/event/modules/ngx_iocp_module.c
+++ b/src/event/modules/ngx_iocp_module.c
@@ -13,8 +13,9 @@
 static ngx_int_t ngx_iocp_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static ngx_thread_value_t __stdcall ngx_iocp_timer(void *data);
 static void ngx_iocp_done(ngx_cycle_t *cycle);
-static ngx_int_t ngx_iocp_add_event(ngx_event_t *ev, int event, u_int key);
-static ngx_int_t ngx_iocp_del_connection(ngx_connection_t *c, u_int flags);
+static ngx_int_t ngx_iocp_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t key);
+static ngx_int_t ngx_iocp_del_connection(ngx_connection_t *c, ngx_uint_t flags);
 static ngx_int_t ngx_iocp_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_uint_t flags);
 static void *ngx_iocp_create_conf(ngx_cycle_t *cycle);
@@ -186,7 +187,7 @@ ngx_iocp_done(ngx_cycle_t *cycle)
 
 
 static ngx_int_t
-ngx_iocp_add_event(ngx_event_t *ev, int event, u_int key)
+ngx_iocp_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t key)
 {
     ngx_connection_t  *c;
 
@@ -196,7 +197,7 @@ ngx_iocp_add_event(ngx_event_t *ev, int event, u_int key)
     c->write->active = 1;
 
     ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "iocp add: fd:%d k:%d ov:%p", c->fd, key, &ev->ovlp);
+                   "iocp add: fd:%d k:%ui ov:%p", c->fd, key, &ev->ovlp);
 
     if (CreateIoCompletionPort((HANDLE) c->fd, iocp, key, 0) == NULL) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
@@ -209,7 +210,7 @@ ngx_iocp_add_event(ngx_event_t *ev, int event, u_int key)
 
 
 static ngx_int_t
-ngx_iocp_del_connection(ngx_connection_t *c, u_int flags)
+ngx_iocp_del_connection(ngx_connection_t *c, ngx_uint_t flags)
 {
 #if 0
     if (flags & NGX_CLOSE_EVENT) {

diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index af916759317b17a1f9a5709e3bb65aec897793f1..c5fd6d80e7273009e804ffd2ae80c54aea962d42 100644 (file)
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -11,16 +11,19 @@
 
 
 typedef struct {
-    int  changes;
-    int  events;
+    ngx_uint_t  changes;
+    ngx_uint_t  events;
 } ngx_kqueue_conf_t;
 
 
 static ngx_int_t ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static void ngx_kqueue_done(ngx_cycle_t *cycle);
-static ngx_int_t ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags);
+static ngx_int_t ngx_kqueue_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_kqueue_del_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, ngx_int_t filter,
+    ngx_uint_t flags);
 static ngx_int_t ngx_kqueue_process_changes(ngx_cycle_t *cycle, ngx_uint_t try);
 static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_uint_t flags);
@@ -43,7 +46,7 @@ int                    ngx_kqueue = -1;
 
 static struct kevent  *change_list, *change_list0, *change_list1;
 static struct kevent  *event_list;
-static int             max_changes, nchanges, nevents;
+static ngx_uint_t      max_changes, nchanges, nevents;
 
 #if (NGX_THREADS)
 static ngx_mutex_t    *list_mutex;
@@ -151,7 +154,9 @@ ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer)
             ts.tv_sec = 0;
             ts.tv_nsec = 0;
 
-            if (kevent(ngx_kqueue, change_list, nchanges, NULL, 0, &ts) == -1) {
+            if (kevent(ngx_kqueue, change_list, (int) nchanges, NULL, 0, &ts)
+                == -1)
+            {
                 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
                               "kevent() failed");
                 return NGX_ERROR;
@@ -273,7 +278,7 @@ ngx_kqueue_done(ngx_cycle_t *cycle)
 
 
 static ngx_int_t
-ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
+ngx_kqueue_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     ngx_int_t          rc;
 #if 0
@@ -289,7 +294,7 @@ ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
 
 #if 0
 
-    if (ev->index < (u_int) nchanges
+    if (ev->index < nchanges
         && ((uintptr_t) change_list[ev->index].udata & (uintptr_t) ~1)
             == (uintptr_t) ev)
     {
@@ -301,10 +306,10 @@ ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
              */
 
             ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                           "kevent activated: %d: ft:%d",
+                           "kevent activated: %d: ft:%i",
                            ngx_event_ident(ev->data), event);
 
-            if (ev->index < (u_int) --nchanges) {
+            if (ev->index < --nchanges) {
                 e = (ngx_event_t *)
                     ((uintptr_t) change_list[nchanges].udata & (uintptr_t) ~1);
                 change_list[ev->index] = change_list[nchanges];
@@ -337,7 +342,7 @@ ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
 
 
 static ngx_int_t
-ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
+ngx_kqueue_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     ngx_int_t     rc;
     ngx_event_t  *e;
@@ -347,19 +352,19 @@ ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
 
     ngx_mutex_lock(list_mutex);
 
-    if (ev->index < (u_int) nchanges
+    if (ev->index < nchanges
         && ((uintptr_t) change_list[ev->index].udata & (uintptr_t) ~1)
             == (uintptr_t) ev)
     {
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                       "kevent deleted: %d: ft:%d",
+                       "kevent deleted: %d: ft:%i",
                        ngx_event_ident(ev->data), event);
 
         /* if the event is still not passed to a kernel we will not pass it */
 
         nchanges--;
 
-        if (ev->index < (u_int) nchanges) {
+        if (ev->index < nchanges) {
             e = (ngx_event_t *)
                     ((uintptr_t) change_list[nchanges].udata & (uintptr_t) ~1);
             change_list[ev->index] = change_list[nchanges];
@@ -396,7 +401,7 @@ ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
 
 
 static ngx_int_t
-ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
+ngx_kqueue_set_event(ngx_event_t *ev, ngx_int_t filter, ngx_uint_t flags)
 {
     struct kevent     *kev;
     struct timespec    ts;
@@ -405,7 +410,7 @@ ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
     c = ev->data;
 
     ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "kevent set event: %d: ft:%d fl:%04Xd",
+                   "kevent set event: %d: ft:%i fl:%04Xi",
                    c->fd, filter, flags);
 
     if (nchanges >= max_changes) {
@@ -415,7 +420,9 @@ ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
         ts.tv_sec = 0;
         ts.tv_nsec = 0;
 
-        if (kevent(ngx_kqueue, change_list, nchanges, NULL, 0, &ts) == -1) {
+        if (kevent(ngx_kqueue, change_list, (int) nchanges, NULL, 0, &ts)
+            == -1)
+        {
             ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno, "kevent() failed");
             return NGX_ERROR;
         }
@@ -426,8 +433,8 @@ ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
     kev = &change_list[nchanges];
 
     kev->ident = c->fd;
-    kev->filter = filter;
-    kev->flags = flags;
+    kev->filter = (short) filter;
+    kev->flags = (u_short) flags;
     kev->udata = NGX_KQUEUE_UDATA_T ((uintptr_t) ev | ev->instance);
 
     if (filter == EVFILT_VNODE) {
@@ -482,7 +489,7 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
         n = 0;
 
     } else {
-        n = nchanges;
+        n = (int) nchanges;
         nchanges = 0;
     }
 
@@ -510,7 +517,7 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                    "kevent timer: %M, changes: %d", timer, n);
 
-    events = kevent(ngx_kqueue, change_list, n, event_list, nevents, tp);
+    events = kevent(ngx_kqueue, change_list, n, event_list, (int) nevents, tp);
 
     if (events == -1) {
         err = ngx_errno;
@@ -696,7 +703,7 @@ ngx_kqueue_process_changes(ngx_cycle_t *cycle, ngx_uint_t try)
         change_list = change_list0;
     }
 
-    n = nchanges;
+    n = (int) nchanges;
     nchanges = 0;
 
     ngx_mutex_unlock(list_mutex);
@@ -758,8 +765,8 @@ ngx_kqueue_init_conf(ngx_cycle_t *cycle, void *conf)
 {
     ngx_kqueue_conf_t *kcf = conf;
 
-    ngx_conf_init_value(kcf->changes, 512);
-    ngx_conf_init_value(kcf->events, 512);
+    ngx_conf_init_uint_value(kcf->changes, 512);
+    ngx_conf_init_uint_value(kcf->events, 512);
 
     return NGX_CONF_OK;
 }

diff --git a/src/event/modules/ngx_kqueue_module.h b/src/event/modules/ngx_kqueue_module.h
index 2e000c4ec948acf65e8f3afb1c239faa1abf9ef7..096d4ae05dd6b46e3983cf57b8c5d683d98d2209 100644 (file)
--- a/src/event/modules/ngx_kqueue_module.h
+++ b/src/event/modules/ngx_kqueue_module.h
@@ -13,5 +13,4 @@ extern ngx_module_t        ngx_kqueue_module;
 extern ngx_event_module_t  ngx_kqueue_module_ctx;
 
 
-
 #endif /* _NGX_KQUEUE_MODULE_H_INCLUDED_ */

diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 199b25bff0bea3be8a536ef6431f62a4c90e0724..db9c419453925e3ca42879d9bb2e8d1b1a4b2b8e 100644 (file)
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -11,15 +11,17 @@
 
 static ngx_int_t ngx_poll_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static void ngx_poll_done(ngx_cycle_t *cycle);
-static ngx_int_t ngx_poll_add_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_poll_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_poll_del_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
 static ngx_int_t ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_uint_t flags);
 static char *ngx_poll_init_conf(ngx_cycle_t *cycle, void *conf);
 
 
 static struct pollfd  *event_list;
-static int             nevents;
+static ngx_int_t       nevents;
 
 
 static ngx_str_t    poll_name = ngx_string("poll");
@@ -108,7 +110,7 @@ ngx_poll_done(ngx_cycle_t *cycle)
 
 
 static ngx_int_t
-ngx_poll_add_event(ngx_event_t *ev, int event, u_int flags)
+ngx_poll_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     ngx_event_t       *e;
     ngx_connection_t  *c;
@@ -119,7 +121,7 @@ ngx_poll_add_event(ngx_event_t *ev, int event, u_int flags)
 
     if (ev->index != NGX_INVALID_INDEX) {
         ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
-                      "poll event fd:%d ev:%d is already set", c->fd, event);
+                      "poll event fd:%d ev:%i is already set", c->fd, event);
         return NGX_OK;
     }
 
@@ -137,11 +139,11 @@ ngx_poll_add_event(ngx_event_t *ev, int event, u_int flags)
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "poll add event: fd:%d ev:%d", c->fd, event);
+                   "poll add event: fd:%d ev:%i", c->fd, event);
 
     if (e == NULL || e->index == NGX_INVALID_INDEX) {
         event_list[nevents].fd = c->fd;
-        event_list[nevents].events = event;
+        event_list[nevents].events = (short) event;
         event_list[nevents].revents = 0;
 
         ev->index = nevents;
@@ -149,9 +151,9 @@ ngx_poll_add_event(ngx_event_t *ev, int event, u_int flags)
 
     } else {
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                       "poll add index: %d", e->index);
+                       "poll add index: %i", e->index);
 
-        event_list[e->index].events |= event;
+        event_list[e->index].events |= (short) event;
         ev->index = e->index;
     }
 
@@ -160,7 +162,7 @@ ngx_poll_add_event(ngx_event_t *ev, int event, u_int flags)
 
 
 static ngx_int_t
-ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
+ngx_poll_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     ngx_event_t       *e;
     ngx_connection_t  *c;
@@ -171,7 +173,7 @@ ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
 
     if (ev->index == NGX_INVALID_INDEX) {
         ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
-                      "poll event fd:%d ev:%d is already deleted",
+                      "poll event fd:%d ev:%i is already deleted",
                       c->fd, event);
         return NGX_OK;
     }
@@ -190,15 +192,15 @@ ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "poll del event: fd:%d ev:%d", c->fd, event);
+                   "poll del event: fd:%d ev:%i", c->fd, event);
 
     if (e == NULL || e->index == NGX_INVALID_INDEX) {
         nevents--;
 
-        if (ev->index < (u_int) nevents) {
+        if (ev->index < (ngx_uint_t) nevents) {
 
             ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                           "index: copy event %d to %d", nevents, ev->index);
+                           "index: copy event %ui to %i", nevents, ev->index);
 
             event_list[ev->index] = event_list[nevents];
 
@@ -209,11 +211,11 @@ ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
                               "unexpected last event");
 
             } else {
-                if (c->read->index == (u_int) nevents) {
+                if (c->read->index == (ngx_uint_t) nevents) {
                     c->read->index = ev->index;
                 }
 
-                if (c->write->index == (u_int) nevents) {
+                if (c->write->index == (ngx_uint_t) nevents) {
                     c->write->index = ev->index;
                 }
             }
@@ -221,9 +223,9 @@ ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
 
     } else {
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                       "poll del index: %d", e->index);
+                       "poll del index: %i", e->index);
 
-        event_list[e->index].events &= ~event;
+        event_list[e->index].events &= (short) ~event;
     }
 
     ev->index = NGX_INVALID_INDEX;

diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index 603cd883f4f853ed407ecaa7e25418d3410ffcd2..761ebe68cfb515dd2efb926db5d9ebedee1ff714 100644 (file)
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -29,10 +29,10 @@ int ngx_linux_rtsig_max;
 
 
 typedef struct {
-    int        signo;
-    ngx_int_t  overflow_events;
-    ngx_int_t  overflow_test;
-    ngx_int_t  overflow_threshold;
+    ngx_uint_t  signo;
+    ngx_uint_t  overflow_events;
+    ngx_uint_t  overflow_test;
+    ngx_uint_t  overflow_threshold;
 } ngx_rtsig_conf_t;
 
 
@@ -41,7 +41,8 @@ extern ngx_event_module_t  ngx_poll_module_ctx;
 static ngx_int_t ngx_rtsig_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static void ngx_rtsig_done(ngx_cycle_t *cycle);
 static ngx_int_t ngx_rtsig_add_connection(ngx_connection_t *c);
-static ngx_int_t ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags);
+static ngx_int_t ngx_rtsig_del_connection(ngx_connection_t *c,
+    ngx_uint_t flags);
 static ngx_int_t ngx_rtsig_process_events(ngx_cycle_t *cycle,
     ngx_msec_t timer, ngx_uint_t flags);
 static ngx_int_t ngx_rtsig_process_overflow(ngx_cycle_t *cycle,
@@ -143,8 +144,8 @@ ngx_rtsig_init(ngx_cycle_t *cycle, ngx_msec_t timer)
     rtscf = ngx_event_get_conf(cycle->conf_ctx, ngx_rtsig_module);
 
     sigemptyset(&set);
-    sigaddset(&set, rtscf->signo);
-    sigaddset(&set, rtscf->signo + 1);
+    sigaddset(&set, (int) rtscf->signo);
+    sigaddset(&set, (int) rtscf->signo + 1);
     sigaddset(&set, SIGIO);
     sigaddset(&set, SIGALRM);
 
@@ -188,7 +189,7 @@ ngx_rtsig_done(ngx_cycle_t *cycle)
 static ngx_int_t
 ngx_rtsig_add_connection(ngx_connection_t *c)
 {
-    int                signo;
+    ngx_uint_t         signo;
     ngx_rtsig_conf_t  *rtscf;
 
     if (c->read->accept && c->read->disabled) {
@@ -211,7 +212,7 @@ ngx_rtsig_add_connection(ngx_connection_t *c)
     signo = rtscf->signo + c->read->instance;
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "rtsig add connection: fd:%d signo:%d", c->fd, signo);
+                   "rtsig add connection: fd:%d signo:%ui", c->fd, signo);
 
     if (fcntl(c->fd, F_SETFL, O_RDWR|O_NONBLOCK|O_ASYNC) == -1) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
@@ -219,7 +220,7 @@ ngx_rtsig_add_connection(ngx_connection_t *c)
         return NGX_ERROR;
     }
 
-    if (fcntl(c->fd, F_SETSIG, signo) == -1) {
+    if (fcntl(c->fd, F_SETSIG, (int) signo) == -1) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
                       "fcntl(F_SETSIG) failed");
         return NGX_ERROR;
@@ -247,7 +248,7 @@ ngx_rtsig_add_connection(ngx_connection_t *c)
 
 
 static ngx_int_t
-ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags)
+ngx_rtsig_del_connection(ngx_connection_t *c, ngx_uint_t flags)
 {
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
                    "rtsig del connection: fd:%d", c->fd);
@@ -348,7 +349,7 @@ ngx_rtsig_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
 
     rtscf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_rtsig_module);
 
-    if (signo == rtscf->signo || signo == rtscf->signo + 1) {
+    if (signo == (int) rtscf->signo || signo == (int) rtscf->signo + 1) {
 
         if (overflow && (ngx_uint_t) si.si_fd > overflow_current) {
             return NGX_OK;
@@ -363,7 +364,7 @@ ngx_rtsig_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
             return NGX_OK;
         }
 
-        instance = signo - rtscf->signo;
+        instance = signo - (int) rtscf->signo;
 
         rev = c->read;
 
@@ -459,8 +460,8 @@ ngx_rtsig_process_overflow(ngx_cycle_t *cycle, ngx_msec_t timer,
 {
     int                name[2], rtsig_max, rtsig_nr, events, ready;
     size_t             len;
-    ngx_int_t          tested, n, i;
     ngx_err_t          err;
+    ngx_uint_t         tested, n, i;
     ngx_event_t       *rev, *wev, **queue;
     ngx_connection_t  *c;
     ngx_rtsig_conf_t  *rtscf;
@@ -638,7 +639,7 @@ ngx_rtsig_process_overflow(ngx_cycle_t *cycle, ngx_msec_t timer,
                  *    "/proc/sys/kernel/rtsig-max" / "rtsig_overflow_threshold"
                  */
 
-                if (rtsig_max / rtscf->overflow_threshold < rtsig_nr) {
+                if (rtsig_max / (int) rtscf->overflow_threshold < rtsig_nr) {
                     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                                    "rtsig queue state: %d/%d",
                                    rtsig_nr, rtsig_max);
@@ -703,19 +704,18 @@ ngx_rtsig_init_conf(ngx_cycle_t *cycle, void *conf)
     ngx_rtsig_conf_t  *rtscf = conf;
 
     /* LinuxThreads use the first 3 RT signals */
-    ngx_conf_init_value(rtscf->signo, SIGRTMIN + 10);
+    ngx_conf_init_uint_value(rtscf->signo, SIGRTMIN + 10);
 
-    ngx_conf_init_value(rtscf->overflow_events, 16);
-    ngx_conf_init_value(rtscf->overflow_test, 32);
-    ngx_conf_init_value(rtscf->overflow_threshold, 10);
+    ngx_conf_init_uint_value(rtscf->overflow_events, 16);
+    ngx_conf_init_uint_value(rtscf->overflow_test, 32);
+    ngx_conf_init_uint_value(rtscf->overflow_threshold, 10);
 
     return NGX_CONF_OK;
 }
 
 
 static char *
-ngx_check_ngx_overflow_threshold_bounds(ngx_conf_t *cf,
-                                                     void *post, void *data)
+ngx_check_ngx_overflow_threshold_bounds(ngx_conf_t *cf, void *post, void *data)
 {
     if (ngx_linux_rtsig_max) {
         return ngx_conf_check_num_bounds(cf, post, data);

diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 9ecac7f2b734ee6bd522b57bf6b51a7adeea5320..1e704c2f69f6426a2b6b91c55e67e776fdcad99b 100644 (file)
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -12,8 +12,10 @@
 
 static ngx_int_t ngx_select_init(ngx_cycle_t *cycle, ngx_msec_t timer);
 static void ngx_select_done(ngx_cycle_t *cycle);
-static ngx_int_t ngx_select_add_event(ngx_event_t *ev, int event, u_int flags);
-static ngx_int_t ngx_select_del_event(ngx_event_t *ev, int event, u_int flags);
+static ngx_int_t ngx_select_add_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
+static ngx_int_t ngx_select_del_event(ngx_event_t *ev, ngx_int_t event,
+    ngx_uint_t flags);
 static ngx_int_t ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
     ngx_uint_t flags);
 static char *ngx_select_init_conf(ngx_cycle_t *cycle, void *conf);
@@ -25,10 +27,10 @@ static fd_set         work_read_fd_set;
 static fd_set         work_write_fd_set;
 
 #if (NGX_WIN32)
-static int            max_read;
-static int            max_write;
+static ngx_uint_t     max_read;
+static ngx_uint_t     max_write;
 #else
-static int            max_fd;
+static ngx_int_t      max_fd;
 #endif
 
 static ngx_uint_t     nevents;
@@ -129,18 +131,18 @@ ngx_select_done(ngx_cycle_t *cycle)
 
 
 static ngx_int_t
-ngx_select_add_event(ngx_event_t *ev, int event, u_int flags)
+ngx_select_add_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     ngx_connection_t  *c;
 
     c = ev->data;
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "select add event fd:%d ev:%d", c->fd, event);
+                   "select add event fd:%d ev:%i", c->fd, event);
 
     if (ev->index != NGX_INVALID_INDEX) {
         ngx_log_error(NGX_LOG_ALERT, ev->log, 0,
-                      "select event fd:%d ev:%d is already set", c->fd, event);
+                      "select event fd:%d ev:%i is already set", c->fd, event);
         return NGX_OK;
     }
 
@@ -190,7 +192,7 @@ ngx_select_add_event(ngx_event_t *ev, int event, u_int flags)
 
 
 static ngx_int_t
-ngx_select_del_event(ngx_event_t *ev, int event, u_int flags)
+ngx_select_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags)
 {
     ngx_connection_t  *c;
 
@@ -203,7 +205,7 @@ ngx_select_del_event(ngx_event_t *ev, int event, u_int flags)
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0,
-                   "select del event fd:%d ev:%d", c->fd, event);
+                   "select del event fd:%d ev:%i", c->fd, event);
 
 #if (NGX_WIN32)
 
@@ -231,7 +233,7 @@ ngx_select_del_event(ngx_event_t *ev, int event, u_int flags)
 
 #endif
 
-    if (ev->index < (u_int) --nevents) {
+    if (ev->index < --nevents) {
         event_index[ev->index] = event_index[nevents];
         event_index[ev->index]->index = ev->index;
     }

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 91efde0091317e42a6e5b0854bfc2856b631107f..d32fb7ffd120ea953717b42ae0c606f7049ef24d 100644 (file)
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -276,7 +276,7 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
 
 
 ngx_int_t
-ngx_handle_read_event(ngx_event_t *rev, u_int flags)
+ngx_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
 {
     if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
 

diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index e1388d5f03449b23c95152fa1e6a1fc541bfd0e0..a2b7c5cc56131b10bd483298d2c11013efb9c08c 100644 (file)
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -126,7 +126,7 @@ struct ngx_event_s {
 
 #endif
 
-    u_int            index;
+    ngx_uint_t       index;
 
     ngx_log_t       *log;
 
@@ -182,7 +182,7 @@ struct ngx_event_s {
 
     /* event should not cross cache line in SMP */
 
-    int              padding[NGX_EVENT_T_PADDING];
+    uint32_t         padding[NGX_EVENT_T_PADDING];
 #endif
 #endif
 };
@@ -195,14 +195,14 @@ typedef struct {
 
 
 typedef struct {
-    ngx_int_t  (*add)(ngx_event_t *ev, int event, u_int flags);
-    ngx_int_t  (*del)(ngx_event_t *ev, int event, u_int flags);
+    ngx_int_t  (*add)(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags);
+    ngx_int_t  (*del)(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags);
 
-    ngx_int_t  (*enable)(ngx_event_t *ev, int event, u_int flags);
-    ngx_int_t  (*disable)(ngx_event_t *ev, int event, u_int flags);
+    ngx_int_t  (*enable)(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags);
+    ngx_int_t  (*disable)(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags);
 
     ngx_int_t  (*add_conn)(ngx_connection_t *c);
-    ngx_int_t  (*del_conn)(ngx_connection_t *c, u_int flags);
+    ngx_int_t  (*del_conn)(ngx_connection_t *c, ngx_uint_t flags);
 
     ngx_int_t  (*process_changes)(ngx_cycle_t *cycle, ngx_uint_t nowait);
     ngx_int_t  (*process_events)(ngx_cycle_t *cycle, ngx_msec_t timer,
@@ -489,7 +489,7 @@ u_char *ngx_accept_log_error(ngx_log_t *log, u_char *buf, size_t len);
 
 
 void ngx_process_events_and_timers(ngx_cycle_t *cycle);
-ngx_int_t ngx_handle_read_event(ngx_event_t *rev, u_int flags);
+ngx_int_t ngx_handle_read_event(ngx_event_t *rev, ngx_uint_t flags);
 ngx_int_t ngx_handle_write_event(ngx_event_t *wev, size_t lowat);
 
 

diff --git a/src/event/ngx_event_busy_lock.c b/src/event/ngx_event_busy_lock.c
index 2d0bad571754b4909188fc22ae7e3e82b08dc749..c5cecc3f54c83b81b671489502ecad95d3de415f 100644 (file)
--- a/src/event/ngx_event_busy_lock.c
+++ b/src/event/ngx_event_busy_lock.c
@@ -9,7 +9,7 @@
 #include <ngx_event.h>
 
 
-static int ngx_event_busy_lock_look_cachable(ngx_event_busy_lock_t *bl,
+static ngx_int_t ngx_event_busy_lock_look_cachable(ngx_event_busy_lock_t *bl,
     ngx_event_busy_lock_ctx_t *ctx);
 static void ngx_event_busy_lock_handler(ngx_event_t *ev);
 static void ngx_event_busy_lock_posted_handler(ngx_event_t *ev);

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 63e5ba95226bcacb750f5e3ac4fa93278164d061..5cfc703e865edd11c93ce9a73177eae21ff845d9 100644 (file)
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -784,7 +784,7 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     /* the maximum limit size is the maximum uint32_t value - the page size */
 
-    if (limit == 0 || limit > NGX_MAX_UINT32_VALUE - ngx_pagesize) {
+    if (limit == 0 || limit > (off_t) (NGX_MAX_UINT32_VALUE - ngx_pagesize)) {
         limit = NGX_MAX_UINT32_VALUE - ngx_pagesize;
     }
 

diff --git a/src/os/unix/ngx_aio_write_chain.c b/src/os/unix/ngx_aio_write_chain.c
index e3d663158402a7c9e41fdff702158bb9cd7a674d..6a156e91bcbbf079f9bb9ea23a34053cdade9f9e 100644 (file)
--- a/src/os/unix/ngx_aio_write_chain.c
+++ b/src/os/unix/ngx_aio_write_chain.c
@@ -21,7 +21,7 @@ ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     /* the maximum limit size is the maximum size_t value - the page size */
 
-    if (limit == 0 || limit > NGX_MAX_SIZE_T_VALUE - ngx_pagesize) {
+    if (limit == 0 || limit > (off_t) (NGX_MAX_SIZE_T_VALUE - ngx_pagesize)) {
         limit = NGX_MAX_SIZE_T_VALUE - ngx_pagesize;
     }
 

diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h
index a4e973dc38d7d9c82cd1463101ed0fd644704122..0bf4fd525824d5269541b8cfecb0c6a91d5aa34b 100644 (file)
--- a/src/os/unix/ngx_freebsd_config.h
+++ b/src/os/unix/ngx_freebsd_config.h
@@ -102,7 +102,7 @@ pid_t rfork_thread(int flags, void *stack, int (*func)(void *arg), void *arg);
 
 
 extern char **environ;
-extern char *malloc_options;
+extern char  *malloc_options;
 
 
 #endif /* _NGX_FREEBSD_CONFIG_H_INCLUDED_ */

diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index 476eff332f91da4339752a7d2f062eef5d0ebce0..c383fbeb5b22344c1e02aa007690fb469fdf8172 100644 (file)
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -72,7 +72,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     /* the maximum limit size is the maximum size_t value - the page size */
 
-    if (limit == 0 || limit > NGX_MAX_SIZE_T_VALUE - ngx_pagesize) {
+    if (limit == 0 || limit > (off_t) (NGX_MAX_SIZE_T_VALUE - ngx_pagesize)) {
         limit = NGX_MAX_SIZE_T_VALUE - ngx_pagesize;
     }
 

diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c
index ab2a3cf1b942b28c65e29fafbf0e5ea5f2bf1e49..e102f27d63d6a50a6a968d0263d535b30c96f726 100644 (file)
--- a/src/os/unix/ngx_linux_sendfile_chain.c
+++ b/src/os/unix/ngx_linux_sendfile_chain.c
@@ -62,7 +62,7 @@ ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     /* the maximum limit size is 2G-1 - the page size */
 
-    if (limit == 0 || limit > NGX_SENDFILE_LIMIT - ngx_pagesize) {
+    if (limit == 0 || limit > (off_t) (NGX_SENDFILE_LIMIT - ngx_pagesize)) {
         limit = NGX_SENDFILE_LIMIT - ngx_pagesize;
     }
 

diff --git a/src/os/unix/ngx_solaris_sendfilev_chain.c b/src/os/unix/ngx_solaris_sendfilev_chain.c
index 04e33666aafffe8dfccfac9e4d8fc6f99d207c97..2feae2fc8381d67f5efcc9e19496822ebcd1a86e 100644 (file)
--- a/src/os/unix/ngx_solaris_sendfilev_chain.c
+++ b/src/os/unix/ngx_solaris_sendfilev_chain.c
@@ -67,7 +67,7 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     /* the maximum limit size is the maximum size_t value - the page size */
 
-    if (limit == 0 || limit > NGX_MAX_SIZE_T_VALUE - ngx_pagesize) {
+    if (limit == 0 || limit > (off_t) (NGX_MAX_SIZE_T_VALUE - ngx_pagesize)) {
         limit = NGX_MAX_SIZE_T_VALUE - ngx_pagesize;
     }
 

diff --git a/src/os/unix/ngx_writev_chain.c b/src/os/unix/ngx_writev_chain.c
index c8eb48269512b81a9fab462e7e332b8d5d43136f..b8754cda39a430e625bc8d79e3083dcd3fdc533c 100644 (file)
--- a/src/os/unix/ngx_writev_chain.c
+++ b/src/os/unix/ngx_writev_chain.c
@@ -48,7 +48,7 @@ ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
     /* the maximum limit size is the maximum size_t value - the page size */
 
-    if (limit == 0 || limit > NGX_MAX_SIZE_T_VALUE - ngx_pagesize) {
+    if (limit == 0 || limit > (off_t) (NGX_MAX_SIZE_T_VALUE - ngx_pagesize)) {
         limit = NGX_MAX_SIZE_T_VALUE - ngx_pagesize;
     }
 

diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index 6bdc57c08aa59faf18243df81ae55f329208092f..ceb934982a08a0e48ccfa36445ccd7ee7b0e614c 100644 (file)
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -120,6 +120,7 @@ typedef unsigned short int  uint16_t;
 
 typedef __int64             int64_t;
 typedef unsigned __int64    uint64_t;
+typedef int                 intptr_t;
 typedef u_int               uintptr_t;
 
 typedef int                 ssize_t;