From da39690aece0c60b3633767e490f51c0c7b8327b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <ossi@users.sf.net>
Date: Sun, 7 Feb 2010 21:20:30 +0100
Subject: [PATCH] fix compile with SSL on Mac OS X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

patch by Remko Tronçon <remko@el-tramo.be>
BUG: 2126899
---
 src/drv_imap.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/drv_imap.c b/src/drv_imap.c
index d50fe11..1090862 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -22,6 +22,15 @@
  * despite that library's more restrictive license.
  */
 
+/* This must come before isync.h to avoid our #define S messing up
+ * blowfish.h on MacOS X. */
+#include <config.h>
+#if HAVE_LIBSSL
+# include <openssl/ssl.h>
+# include <openssl/err.h>
+# include <openssl/hmac.h>
+#endif
+
 #include "isync.h"
 
 #include <assert.h>
@@ -44,11 +53,6 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#if HAVE_LIBSSL
-# include <openssl/ssl.h>
-# include <openssl/err.h>
-# include <openssl/hmac.h>
-#endif
 
 typedef struct imap_server_conf {
 	struct imap_server_conf *next;