From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 10 Oct 2016 15:44:17 +0000 (+0300)
Subject: Modules compatibility: removed dependencies on NGX_MAIL_SSL.
X-Git-Tag: release-1.11.5~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=a6cb8210905f35977276cb3861184e4dad99cc2a;p=nginx.git

Modules compatibility: removed dependencies on NGX_MAIL_SSL.

External structures are now identical regardless of mail SSL module
compiled in or not.
---

diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index 7c8422894..c30af35c9 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -35,9 +35,7 @@ typedef struct {
 
     unsigned                bind:1;
     unsigned                wildcard:1;
-#if (NGX_MAIL_SSL)
     unsigned                ssl:1;
-#endif
 #if (NGX_HAVE_INET6)
     unsigned                ipv6only:1;
 #endif
@@ -54,9 +52,7 @@ typedef struct {
 typedef struct {
     ngx_mail_conf_ctx_t    *ctx;
     ngx_str_t               addr_text;
-#if (NGX_MAIL_SSL)
     ngx_uint_t              ssl;    /* unsigned   ssl:1; */
-#endif
 } ngx_mail_addr_conf_t;
 
 typedef struct {