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 | 844c78556bc93343dd1c3c9236b5c16f4e2eac39 (patch) | |
| tree | b3649cec59d23ca71d1d169ca3c4cc46e3265eaa /src/core | |
| parent | 9f6e8673f40f7532bf3059bda41e05b545520dd3 (diff) | |
| download | nginx-844c78556bc93343dd1c3c9236b5c16f4e2eac39.tar.gz nginx-844c78556bc93343dd1c3c9236b5c16f4e2eac39.tar.bz2 | |
Modules compatibility: compatibility with NGX_HAVE_FILE_AIO.
With this change it is now possible to load modules compiled without
the "--with-file-aio" configure option into nginx binary compiled with it,
and vice versa, assuming both use the "--with-compat" option.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_buf.h | 6 | ||||
| -rw-r--r-- | src/core/ngx_connection.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_file.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_module.h | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h index 224807cb0..12781a782 100644 --- a/src/core/ngx_buf.h +++ b/src/core/ngx_buf.h @@ -72,10 +72,8 @@ typedef struct ngx_output_chain_ctx_s ngx_output_chain_ctx_t; typedef ngx_int_t (*ngx_output_chain_filter_pt)(void *ctx, ngx_chain_t *in); -#if (NGX_HAVE_FILE_AIO) typedef void (*ngx_output_chain_aio_pt)(ngx_output_chain_ctx_t *ctx, ngx_file_t *file); -#endif struct ngx_output_chain_ctx_s { ngx_buf_t *buf; @@ -90,9 +88,9 @@ struct ngx_output_chain_ctx_s { unsigned need_in_temp:1; unsigned aio:1; -#if (NGX_HAVE_FILE_AIO) +#if (NGX_HAVE_FILE_AIO || NGX_COMPAT) ngx_output_chain_aio_pt aio_handler; -#if (NGX_HAVE_AIO_SENDFILE) +#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) ssize_t (*aio_preload)(ngx_buf_t *file); #endif #endif diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index b527954e6..a49c5a656 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -182,7 +182,7 @@ struct ngx_connection_s { unsigned need_last_buf:1; -#if (NGX_HAVE_AIO_SENDFILE) +#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) unsigned busy_count:2; #endif diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h index cff74cba1..320adc295 100644 --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h @@ -30,7 +30,7 @@ struct ngx_file_s { ngx_thread_task_t *thread_task; #endif -#if (NGX_HAVE_FILE_AIO) +#if (NGX_HAVE_FILE_AIO || NGX_COMPAT) ngx_event_aio_t *aio; #endif diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h index 626481d8a..4d0db44c6 100644 --- a/src/core/ngx_module.h +++ b/src/core/ngx_module.h @@ -35,13 +35,13 @@ #define NGX_MODULE_SIGNATURE_2 "0" #endif -#if (NGX_HAVE_FILE_AIO) +#if (NGX_HAVE_FILE_AIO || NGX_COMPAT) #define NGX_MODULE_SIGNATURE_3 "1" #else #define NGX_MODULE_SIGNATURE_3 "0" #endif -#if (NGX_HAVE_AIO_SENDFILE) +#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) #define NGX_MODULE_SIGNATURE_4 "1" #else #define NGX_MODULE_SIGNATURE_4 "0" |