aboutsummaryrefslogtreecommitdiff
path: root/lib/libmd/md4.h
diff options
context:
space:
mode:
authorThomas Quinot <thomas@FreeBSD.org>2015-05-10 21:21:52 +0000
committerThomas Quinot <thomas@FreeBSD.org>2015-05-10 21:21:52 +0000
commit55b130956d63f4aa283b24b0db3dc3d61f6c0ec0 (patch)
tree2184d83b8147ea340c8f53c39d0f4a68f03f3136 /lib/libmd/md4.h
parentdef4ea7f7891599b18f43c1ff51ede65e35e20bd (diff)
downloadsrc-55b130956d63f4aa283b24b0db3dc3d61f6c0ec0.tar.gz
src-55b130956d63f4aa283b24b0db3dc3d61f6c0ec0.zip
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
Notes
Notes: svn path=/head/; revision=282736
Diffstat (limited to 'lib/libmd/md4.h')
-rw-r--r--lib/libmd/md4.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/libmd/md4.h b/lib/libmd/md4.h
index efef98fa5a1d..086a27b6ba22 100644
--- a/lib/libmd/md4.h
+++ b/lib/libmd/md4.h
@@ -38,14 +38,30 @@ __BEGIN_DECLS
/* Ensure libmd symbols do not clash with libcrypto */
+#ifndef MD4Init
#define MD4Init _libmd_MD4Init
+#endif
+#ifndef MD4Update
#define MD4Update _libmd_MD4Update
+#endif
+#ifndef MD4Pad
#define MD4Pad _libmd_MD4Pad
+#endif
+#ifndef MD4Final
#define MD4Final _libmd_MD4Final
+#endif
+#ifndef MD4End
#define MD4End _libmd_MD4End
+#endif
+#ifndef MD4File
#define MD4File _libmd_MD4File
+#endif
+#ifndef MD4FileChunk
#define MD4FileChunk _libmd_MD4FileChunk
+#endif
+#ifndef MD4Data
#define MD4Data _libmd_MD4Data
+#endif
void MD4Init(MD4_CTX *);
void MD4Update(MD4_CTX *, const void *, unsigned int);