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

From: Nicolas Pitre <nico@cam.org>
Date: Sep 30, 2008, 20:46 UTC
Message-ID: <alpine.LFD.2.00.0809301645340.3635@xanadu.home>
In-Reply-To: <20080930203928.GN21310@spearce.org>

On Tue, 30 Sep 2008, Shawn O. Pearce wrote:

Show 37 quoted lines

> 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 */

With that, my build on ARM bombs out with:

    CC imap-send.o
In file included from /usr/include/openssl/kssl.h:71,
                 from /usr/include/openssl/ssl.h:191,
                 from imap-send.c:30:
/usr/include/ctype.h:102: error: expected expression before ']' token
/usr/include/ctype.h:102: error: expected ')' before '!=' token
/usr/include/ctype.h:103: error: expected expression before ']' token
/usr/include/ctype.h:103: error: expected ')' before '!=' token
/usr/include/ctype.h:105: error: expected expression before ']' token
/usr/include/ctype.h:105: error: expected ')' before '!=' token
/usr/include/ctype.h:110: error: expected expression before ']' token
/usr/include/ctype.h:110: error: expected ')' before '!=' token
/usr/include/ctype.h:116: error: expected declaration specifiers or '...' before '(' token
/usr/include/ctype.h:116: error: expected declaration specifiers or '...' before numeric constant
/usr/include/ctype.h:119: error: expected declaration specifiers or '...' before '(' token
/usr/include/ctype.h:119: error: expected declaration specifiers or '...' before numeric constant
/usr/include/ctype.h:191: error: expected declaration specifiers or '...' before '(' token
/usr/include/ctype.h:191: error: expected declaration specifiers or '...' before numeric constant
/usr/include/ctype.h:192: error: redefinition of 'sane_case'
git-compat-util.h:338: error: previous definition of 'sane_case' was here
/usr/include/ctype.h: In function 'sane_case':
/usr/include/ctype.h:192: error: number of arguments doesn't match prototype
git-compat-util.h:338: error: prototype declaration
/usr/include/ctype.h:193: error: '__c' undeclared (first use in this function)
/usr/include/ctype.h:193: error: (Each undeclared identifier is reported only once
/usr/include/ctype.h:193: error: for each function it appears in.)
/usr/include/ctype.h: At top level:
/usr/include/ctype.h:197: error: expected declaration specifiers or '...' before '(' token
/usr/include/ctype.h:197: error: expected declaration specifiers or '...' before numeric constant
/usr/include/ctype.h:198: error: redefinition of 'sane_case'
/usr/include/ctype.h:192: error: previous definition of 'sane_case' was here
/usr/include/ctype.h: In function 'sane_case':
/usr/include/ctype.h:198: error: number of arguments doesn't match prototype
/usr/include/ctype.h:192: error: prototype declaration
/usr/include/ctype.h:199: error: '__c' undeclared (first use in this function)
make: *** [imap-send.o] Error 1

Nicolas