commit 84cc8b5c84fb05deb08c5bc99c0be3670e3faa2f
Author: Oswald Buddenhagen <o...@kde.org>
Date: Sun Feb 7 21:20:30 2010 +0100
fix compile with SSL on Mac OS X
patch by
CCMAIL: Remko Tronçon <tron...@users.sf.net>
BUG: 2126899
one could factor out the driver-related declarations to an own include
file and have the drivers include only that, which would have the side
effect of avoiding that problem alltogether. maybe later ...
src/drv_imap.c | 14 +++++++++-----
1 files 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;
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel
