From e400455deb0c5717b85fd4747795cd7749fbd953 Mon Sep 17 00:00:00 2001
From: Luiz Otavio O Souza <luiz@netgate.com>
Date: Tue, 15 Sep 2015 15:53:04 -0500
Subject: MFC r282736:

Unbreak build following rev. 282726

(Makefile.inc1): add dependency of xinstall on libmd to
avoid failure of parallel bootstrap.

(lib/libmd/*.h): do not redefine symbols if already
defined as macros (libcrypt uses the same sources internally,
redefining symbols with a prefix of its own).

Fixes build failures caused by previous change to libmd.

Reported by: ian
Pointy hat to: thomas

TAG:	IPSEC-HEAD
Issue:	#4841
---
 lib/libmd/sha.h | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'lib/libmd/sha.h')

diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h
index 502f1ae..c608c5b 100644
--- a/lib/libmd/sha.h
+++ b/lib/libmd/sha.h
@@ -82,29 +82,69 @@ __BEGIN_DECLS
 
 /* Ensure libmd symbols do not clash with libcrypto */
 
+#ifndef SHA_Init
 #define SHA_Init	_libmd_SHA_Init
+#endif
+#ifndef SHA_Update
 #define SHA_Update	_libmd_SHA_Update
+#endif
+#ifndef SHA_Final
 #define SHA_Final	_libmd_SHA_Final
+#endif
+#ifndef SHA_End
 #define SHA_End		_libmd_SHA_End
+#endif
+#ifndef SHA_File
 #define SHA_File	_libmd_SHA_File
+#endif
+#ifndef SHA_FileChunk
 #define SHA_FileChunk	_libmd_SHA_FileChunk
+#endif
+#ifndef SHA_Data
 #define SHA_Data	_libmd_SHA_Data
+#endif
 
+#ifndef SHA_Transform
 #define SHA_Transform	_libmd_SHA_Transform
+#endif
+#ifndef SHA_version
 #define SHA_version	_libmd_SHA_version
+#endif
+#ifndef sha_block
 #define sha_block	_libmd_sha_block
+#endif
 
+#ifndef SHA1_Init
 #define SHA1_Init	_libmd_SHA1_Init
+#endif
+#ifndef SHA1_Update
 #define SHA1_Update	_libmd_SHA1_Update
+#endif
+#ifndef SHA1_Final
 #define SHA1_Final	_libmd_SHA1_Final
+#endif
+#ifndef SHA1_End
 #define SHA1_End	_libmd_SHA1_End
+#endif
+#ifndef SHA1_File
 #define SHA1_File	_libmd_SHA1_File
+#endif
+#ifndef SHA1_FileChunk
 #define SHA1_FileChunk	_libmd_SHA1_FileChunk
+#endif
+#ifndef SHA1_Data
 #define SHA1_Data	_libmd_SHA1_Data
+#endif
 
+#ifndef SHA1_Transform
 #define SHA1_Transform	_libmd_SHA1_Transform
+#endif
+#ifndef SHA1_version
 #define SHA1_version	_libmd_SHA1_version
+#endif
+#ifndef sha1_block
 #define sha1_block	_libmd_sha1_block
+#endif
 
 void	SHA_Init(SHA_CTX *c);
 void	SHA_Update(SHA_CTX *c, const void *data, size_t len);
-- 
cgit v1.1