From: Pierre Habouzit <madcoder@debian.org>
Date: Sat, 31 Mar 2007 13:55:28 +0000 (+0200)
Subject: wibble
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=2bc76f88e99c16e773c2b2ba805a0bf3e2c034fd

wibble

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/mutt_libesmtp.h b/mutt_libesmtp.h
index c11ee2c..ef72a8d 100644
--- a/mutt_libesmtp.h
+++ b/mutt_libesmtp.h
@@ -10,7 +10,8 @@
 #ifndef _MUTT_LIBESMTP_H
 #define _MUTT_LIBESMTP_H
 
-#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+#ifdef USE_LIBESMTP
+#if (defined (USE_SSL) || defined (USE_GNUTLS))
 int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
                                 char* errbuf, size_t errlen);
 #endif
@@ -19,5 +20,6 @@ int mutt_libesmtp_invoke (address_t * from,       /* the sender */
                           address_t * to, address_t * cc, address_t * bcc,    /* recips */
                           const char *msg,      /* file containing message */
                           int eightbit);        /* message contains 8bit chars */
+#endif
 
 #endif /* !_MUTT_LIBESMTP_H */
diff --git a/sendlib.c b/sendlib.c
index ad29311..e45ad11 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -27,10 +27,7 @@
 #include "pager.h"
 #include "charset.h"
 #include "mutt_idna.h"
-
-#ifdef USE_LIBESMTP
-# include "mutt_libesmtp.h"
-#endif /* USE_LIBESMTP */
+#include "mutt_libesmtp.h"
 
 #ifdef USE_NNTP
 #include <nntp/nntp.h>