Code

fix openssl headers conflicting with custom SHA1 implementations
authorNicolas Pitre <nico@cam.org>
Wed, 1 Oct 2008 18:05:20 +0000 (14:05 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 3 Oct 2008 01:06:56 +0000 (18:06 -0700)
commit9126f0091f271f090cc030a788219574ab0fea97
tree9fab6f7852fddc93392675a7d67148a3dc843ce6
parent120a385afb8ce94b3918d74d4a79ca5938a95304
fix openssl headers conflicting with custom SHA1 implementations

On ARM I have the following compilation errors:

    CC fast-import.o
In file included from cache.h:8,
                 from builtin.h:6,
                 from fast-import.c:142:
arm/sha1.h:14: error: conflicting types for 'SHA_CTX'
/usr/include/openssl/sha.h:105: error: previous declaration of 'SHA_CTX' was here
arm/sha1.h:16: error: conflicting types for 'SHA1_Init'
/usr/include/openssl/sha.h:115: error: previous declaration of 'SHA1_Init' was here
arm/sha1.h:17: error: conflicting types for 'SHA1_Update'
/usr/include/openssl/sha.h:116: error: previous declaration of 'SHA1_Update' was here
arm/sha1.h:18: error: conflicting types for 'SHA1_Final'
/usr/include/openssl/sha.h:117: error: previous declaration of 'SHA1_Final' was here
make: *** [fast-import.o] Error 1

This is because openssl header files are always included in
git-compat-util.h since commit 684ec6c63c whenever NO_OPENSSL is not
set, which somehow brings in <openssl/sha1.h> clashing with the custom
ARM version.  Compilation of git is probably broken on PPC too for the
same reason.

Turns out that the only file requiring openssl/ssl.h and openssl/err.h
is imap-send.c.  But only moving those problematic includes there
doesn't solve the issue as it also includes cache.h which brings in the
conflicting local SHA1 header file.

As suggested by Jeff King, the best solution is to rename our references
to SHA1 functions and structure to something git specific, and define those
according to the implementation used.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
24 files changed:
arm/sha1.c
arm/sha1.h
arm/sha1_arm.S
builtin-unpack-objects.c
cache.h
csum-file.c
csum-file.h
diff.c
fast-import.c
http-push.c
http-walker.c
index-pack.c
mozilla-sha1/sha1.c
mozilla-sha1/sha1.h
pack-check.c
pack-write.c
patch-id.c
ppc/sha1.c
ppc/sha1.h
ppc/sha1ppc.S
read-cache.c
rerere.c
sha1_file.c
test-sha1.c