]> git.kaiwu.me - nginx.git/commitdiff
Modules compatibility: removed dependencies on NGX_MAIL_SSL.
authorMaxim Dounin <mdounin@mdounin.ru>
Mon, 10 Oct 2016 15:44:17 +0000 (18:44 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Mon, 10 Oct 2016 15:44:17 +0000 (18:44 +0300)
External structures are now identical regardless of mail SSL module
compiled in or not.

src/mail/ngx_mail.h

index 7c8422894b8524fecee5b0f27d35591392a41d94..c30af35c9b4e609674026ae5ee972067ed95715b 100644 (file)
@@ -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 {