summaryrefslogtreecommitdiffhomepage
path: root/src/event
diff options
context:
space:
mode:
Diffstat (limited to 'src/event')
-rw-r--r--src/event/modules/ngx_kqueue_module.c6
-rw-r--r--src/event/modules/ngx_poll_module.c2
-rw-r--r--src/event/modules/ngx_select_module.c2
-rw-r--r--src/event/ngx_event.c4
-rw-r--r--src/event/ngx_event_busy_lock.h2
-rw-r--r--src/event/ngx_event_connect.h2
-rw-r--r--src/event/ngx_event_mutex.c2
7 files changed, 10 insertions, 10 deletions
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 9e7a1bdb6..17214c5fb 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -48,7 +48,7 @@ static struct kevent *change_list, *change_list0, *change_list1;
static struct kevent *event_list;
static ngx_uint_t max_changes, nchanges, nevents;
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
static ngx_mutex_t *list_mutex;
static ngx_mutex_t *kevent_mutex;
#endif
@@ -133,7 +133,7 @@ ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer)
return NGX_ERROR;
}
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
list_mutex = ngx_mutex_init(cycle->log, 0);
if (list_mutex == NULL) {
@@ -257,7 +257,7 @@ ngx_kqueue_done(ngx_cycle_t *cycle)
ngx_kqueue = -1;
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
ngx_mutex_destroy(kevent_mutex);
ngx_mutex_destroy(list_mutex);
#endif
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index bad1a7d2a..3617afb95 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -413,7 +413,7 @@ ngx_poll_init_conf(ngx_cycle_t *cycle, void *conf)
return NGX_CONF_OK;
}
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
"poll() is not supported in the threaded mode");
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index fa2d55ae2..e83744431 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -419,7 +419,7 @@ ngx_select_init_conf(ngx_cycle_t *cycle, void *conf)
return NGX_CONF_ERROR;
}
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
"select() is not supported in the threaded mode");
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 26c3b9716..885528aae 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -212,7 +212,7 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
timer = ngx_event_find_timer();
flags = NGX_UPDATE_TIME;
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
if (timer == NGX_TIMER_INFINITE || timer > 500) {
timer = 500;
@@ -722,7 +722,7 @@ ngx_event_process_init(ngx_cycle_t *cycle)
next = &c[i];
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
c[i].lock = 0;
#endif
} while (i);
diff --git a/src/event/ngx_event_busy_lock.h b/src/event/ngx_event_busy_lock.h
index 254c233e7..a7e556cf6 100644
--- a/src/event/ngx_event_busy_lock.h
+++ b/src/event/ngx_event_busy_lock.h
@@ -46,7 +46,7 @@ typedef struct {
ngx_event_busy_lock_ctx_t *events;
ngx_event_busy_lock_ctx_t *last;
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
ngx_mutex_t *mutex;
#endif
} ngx_event_busy_lock_t;
diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h
index e73825885..ab35836a2 100644
--- a/src/event/ngx_event_connect.h
+++ b/src/event/ngx_event_connect.h
@@ -53,7 +53,7 @@ struct ngx_peer_connection_s {
ngx_event_save_peer_session_pt save_session;
#endif
-#if (NGX_THREADS)
+#if (NGX_OLD_THREADS)
ngx_atomic_t *lock;
#endif
diff --git a/src/event/ngx_event_mutex.c b/src/event/ngx_event_mutex.c
index 98efbb0d8..66befe3b6 100644
--- a/src/event/ngx_event_mutex.c
+++ b/src/event/ngx_event_mutex.c
@@ -28,7 +28,7 @@ ngx_int_t ngx_event_mutex_timedlock(ngx_event_mutex_t *m, ngx_msec_t timer,
m->last = ev;
ev->next = NULL;
-#if (NGX_THREADS0)
+#if (NGX_OLD_THREADS0)
ev->light = 1;
#endif