mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-13 08:38:51 +02:00
69b63c93ff
Bug: https://bugs.gentoo.org/923095 Bug: https://bugs.gentoo.org/862816 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From: Jan Palus <jpalus@fastmail.com>
|
|
Date: Sun, 17 Nov 2024 17:58:42 +0000 (+0100)
|
|
Subject: md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
|
|
X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=353a3236d9328349c18ce2e4e984755cb4a76ea7
|
|
|
|
md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
|
|
|
|
* lib/md5-stream.c (GL_OPENSSL_INLINE): Remove definition, that caused
|
|
the symbols defined in md5.o to be defined in md5-stream.o as well.
|
|
* lib/sha1-stream.c (GL_OPENSSL_INLINE): Likewise.
|
|
* lib/sha256-stream.c (GL_OPENSSL_INLINE): Likewise.
|
|
* lib/sha512-stream.c (GL_OPENSSL_INLINE): Likewise.
|
|
* lib/sm3-stream.c (GL_OPENSSL_INLINE): Likewise.
|
|
|
|
Copyright-paperwork-exempt: Yes
|
|
---
|
|
|
|
diff --git a/lib/md5-stream.c b/lib/md5-stream.c
|
|
index fdd2bd8b4b..2cbdda6b0f 100644
|
|
--- a/lib/md5-stream.c
|
|
+++ b/lib/md5-stream.c
|
|
@@ -22,9 +22,6 @@
|
|
#include <config.h>
|
|
|
|
/* Specification. */
|
|
-#if HAVE_OPENSSL_MD5
|
|
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
|
|
-#endif
|
|
#include "md5.h"
|
|
|
|
#include <stdlib.h>
|
|
diff --git a/lib/sha1-stream.c b/lib/sha1-stream.c
|
|
index cbdf95ab76..b713e678a6 100644
|
|
--- a/lib/sha1-stream.c
|
|
+++ b/lib/sha1-stream.c
|
|
@@ -24,9 +24,6 @@
|
|
#include <config.h>
|
|
|
|
/* Specification. */
|
|
-#if HAVE_OPENSSL_SHA1
|
|
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
|
|
-#endif
|
|
#include "sha1.h"
|
|
|
|
#include <stdlib.h>
|