Fix post-rebase merge issues.

[users/heiko/exim.git] / src / src / globals.h

diff --git a/src/src/globals.h b/src/src/globals.h
index 7ed9d5ab6d45e2270ef48f3891757f5dbe36fde6..e910dbe1beba88a108185890ad48d84e47d749e9 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -82,9 +82,7 @@ typedef struct {
   BOOL    on_connect;         /* For older MTAs that don't STARTTLS */
   uschar *on_connect_ports;   /* Ports always tls-on-connect */
   uschar *peerdn;             /* DN from peer */
   BOOL    on_connect;         /* For older MTAs that don't STARTTLS */
   uschar *on_connect_ports;   /* Ports always tls-on-connect */
   uschar *peerdn;             /* DN from peer */

-#ifndef USE_GNUTLS

   uschar *sni;                /* Server Name Indication */
   uschar *sni;                /* Server Name Indication */

-#endif

 } tls_support;
 extern tls_support tls_in;
 extern tls_support tls_out;
 } tls_support;
 extern tls_support tls_in;
 extern tls_support tls_out;