diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-10 18:44:17 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-10 18:44:17 +0300 |
| commit | 9f6e8673f40f7532bf3059bda41e05b545520dd3 (patch) | |
| tree | 6bb28049fef591146534df799590c137b5ae89db /src/core/ngx_buf.h | |
| parent | 82ec8492717dcf141eead17fd158ff3f9e072e84 (diff) | |
| download | nginx-9f6e8673f40f7532bf3059bda41e05b545520dd3.tar.gz nginx-9f6e8673f40f7532bf3059bda41e05b545520dd3.zip | |
Modules compatibility: compatibility with NGX_THREADS.
With this change it is now possible to load modules compiled without
the "--with-threads" configure option into nginx binary compiled with it,
and vice versa (if a module does not use thread-specific functions),
assuming both use the "--with-compat" option.
Diffstat (limited to 'src/core/ngx_buf.h')
| -rw-r--r-- | src/core/ngx_buf.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h index 00522cce5..224807cb0 100644 --- a/src/core/ngx_buf.h +++ b/src/core/ngx_buf.h @@ -88,9 +88,7 @@ struct ngx_output_chain_ctx_s { unsigned unaligned:1; unsigned need_in_memory:1; unsigned need_in_temp:1; -#if (NGX_HAVE_FILE_AIO || NGX_THREADS) unsigned aio:1; -#endif #if (NGX_HAVE_FILE_AIO) ngx_output_chain_aio_pt aio_handler; @@ -99,7 +97,7 @@ struct ngx_output_chain_ctx_s { #endif #endif -#if (NGX_THREADS) +#if (NGX_THREADS || NGX_COMPAT) ngx_int_t (*thread_handler)(ngx_thread_task_t *task, ngx_file_t *file); ngx_thread_task_t *thread_task; |