Re: [PATCH, resent] fix openssl headers conflicting with custom SHA1 implementations

["Shawn O. Pearce" <spearce@spearce.org>]

Nicolas Pitre <nico@cam.org> wrote:
> On ARM I have the following compilation errors:
...
> This is a bit ugly but given the rat nest of system includes we have I 
> don't know how to solve this any better.

Hmm.  On Linux x86 with your change:

In file included from imap-send.c:32:
cache.h: In function 'create_ce_mode':
cache.h:186: error: 'S_IFLNK' undeclared (first use in this function)

I think that last hunk which moved the openssl includes to be before
cache.h is the problem.  This squashed in seems to make it my build
work again:

diff --git a/imap-send.c b/imap-send.c
index 01f1c9a..6b8c66e 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "cache.h"
 #ifdef NO_OPENSSL
 typedef void *SSL;
 #else
@@ -29,8 +30,6 @@ typedef void *SSL;
 #include <openssl/err.h>
 #endif
 
-#include "cache.h"
-
 struct store_conf {
 	char *name;
 	const char *path; /* should this be here? its interpretation is driver-specific */

-- 
Shawn.