diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-03-04 18:26:25 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-03-04 18:26:25 +0300 |
| commit | 83ba5ed2ecc1ca06971639e4e2c7325aaa8e5101 (patch) | |
| tree | 7984305b05776fd3be9096797dd6c3793407f5c0 /src/core/ngx_cycle.h | |
| parent | b89e3bc03448cb83cc339781a6037e6a73954c01 (diff) | |
| download | nginx-83ba5ed2ecc1ca06971639e4e2c7325aaa8e5101.tar.gz nginx-83ba5ed2ecc1ca06971639e4e2c7325aaa8e5101.zip | |
Renamed NGX_THREADS to NGX_OLD_THREADS because of deprecation.
It's mostly dead code and the original idea of worker threads has been rejected.
Diffstat (limited to 'src/core/ngx_cycle.h')
| -rw-r--r-- | src/core/ngx_cycle.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h index 21bf5ca3f..be90a7281 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h @@ -103,7 +103,7 @@ typedef struct { ngx_array_t env; char **environment; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) ngx_int_t worker_threads; size_t thread_stack_size; #endif @@ -111,10 +111,14 @@ typedef struct { } ngx_core_conf_t; +#if (NGX_OLD_THREADS) + typedef struct { ngx_pool_t *pool; /* pcre's malloc() pool */ } ngx_core_tls_t; +#endif + #define ngx_is_init_cycle(cycle) (cycle->conf_ctx == NULL) @@ -136,7 +140,7 @@ extern ngx_array_t ngx_old_cycles; extern ngx_module_t ngx_core_module; extern ngx_uint_t ngx_test_config; extern ngx_uint_t ngx_quiet_mode; -#if (NGX_THREADS) +#if (NGX_OLD_THREADS) extern ngx_tls_key_t ngx_core_tls_key; #endif |