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.

1 files changed, 12 insertions, 15 deletions

diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 2819c1a7d..8f8489fcb 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -12,22 +12,19 @@
 #include <ngx_config.h>
 
 
-typedef struct ngx_module_s      ngx_module_t;
-typedef struct ngx_conf_s        ngx_conf_t;
-typedef struct ngx_cycle_s       ngx_cycle_t;
-typedef struct ngx_pool_s        ngx_pool_t;
-typedef struct ngx_chain_s       ngx_chain_t;
-typedef struct ngx_log_s         ngx_log_t;
-typedef struct ngx_open_file_s   ngx_open_file_t;
-typedef struct ngx_command_s     ngx_command_t;
-typedef struct ngx_file_s        ngx_file_t;
-typedef struct ngx_event_s       ngx_event_t;
-typedef struct ngx_event_aio_s   ngx_event_aio_t;
-typedef struct ngx_connection_s  ngx_connection_t;
-
-#if (NGX_THREADS)
+typedef struct ngx_module_s       ngx_module_t;
+typedef struct ngx_conf_s         ngx_conf_t;
+typedef struct ngx_cycle_s        ngx_cycle_t;
+typedef struct ngx_pool_s         ngx_pool_t;
+typedef struct ngx_chain_s        ngx_chain_t;
+typedef struct ngx_log_s          ngx_log_t;
+typedef struct ngx_open_file_s    ngx_open_file_t;
+typedef struct ngx_command_s      ngx_command_t;
+typedef struct ngx_file_s         ngx_file_t;
+typedef struct ngx_event_s        ngx_event_t;
+typedef struct ngx_event_aio_s    ngx_event_aio_t;
+typedef struct ngx_connection_s   ngx_connection_t;
 typedef struct ngx_thread_task_s  ngx_thread_task_t;
-#endif
 
 typedef void (*ngx_event_handler_pt)(ngx_event_t *ev);
 typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);