Removed influence of some options on structures.

diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h
index f652b20efbb1a9d6659309d84084cb6d97dbf715..00522cce5e6b6b8639d8355a6e5f881e9b403a87 100644 (file)
--- a/src/core/ngx_buf.h
+++ b/src/core/ngx_buf.h
@@ -85,9 +85,7 @@ struct ngx_output_chain_ctx_s {
 
     unsigned                     sendfile:1;
     unsigned                     directio:1;
-#if (NGX_HAVE_ALIGNED_DIRECTIO)
     unsigned                     unaligned:1;
-#endif
     unsigned                     need_in_memory:1;
     unsigned                     need_in_temp:1;
 #if (NGX_HAVE_FILE_AIO || NGX_THREADS)

diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h
index 10b72a154ca610ff6ffdf8912eee70043368f3e2..25809d047adb476bb099f0c586c2da4f0c45dc40 100644 (file)
--- a/src/event/ngx_event_connect.h
+++ b/src/event/ngx_event_connect.h
@@ -61,9 +61,7 @@ struct ngx_peer_connection_s {
     ngx_log_t                       *log;
 
     unsigned                         cached:1;
-#if (NGX_HAVE_TRANSPARENT_PROXY)
     unsigned                         transparent:1;
-#endif
 
                                      /* ngx_connection_log_error_e */
     unsigned                         log_error:2;

diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 499c1eff59b23b5cef836e80f66890fe34dcabaf..a641d78fdd48a5288a8d2f269db050dc44e5e881 100644 (file)
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -302,7 +302,7 @@ typedef struct {
     ngx_http_addr_conf_t             *addr_conf;
     ngx_http_conf_ctx_t              *conf_ctx;
 
-#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME)
+#if (NGX_HTTP_SSL)
     ngx_str_t                        *ssl_servername;
 #if (NGX_PCRE)
     ngx_http_regex_t                 *ssl_servername_regex;
@@ -539,11 +539,8 @@ struct ngx_http_request_s {
     unsigned                          subrequest_ranges:1;
     unsigned                          single_range:1;
     unsigned                          disable_not_modified:1;
-
-#if (NGX_STAT_STUB)
     unsigned                          stat_reading:1;
     unsigned                          stat_writing:1;
-#endif
 
     /* used to parse HTTP headers */