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://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=353a3236d9328349c18ce2e4e984755cb4a76ea7;p=gnulib.git

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/ChangeLog b/ChangeLog
index 29e81ac19f..888555448b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-11-17  Jan Palus  <jpalus@fastmail.com>  (tiny change)
+
+	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.
+
 2024-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	std-gnu23: sync from Autoconf
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>
diff --git a/lib/sha256-stream.c b/lib/sha256-stream.c
index 690ca967dd..82abc2c8af 100644
--- a/lib/sha256-stream.c
+++ b/lib/sha256-stream.c
@@ -23,9 +23,6 @@
 #include <config.h>
 
 /* Specification.  */
-#if HAVE_OPENSSL_SHA256
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
 #include "sha256.h"
 
 #include <stdlib.h>
diff --git a/lib/sha512-stream.c b/lib/sha512-stream.c
index 74fdd5047d..6362e55a6a 100644
--- a/lib/sha512-stream.c
+++ b/lib/sha512-stream.c
@@ -23,9 +23,6 @@
 #include <config.h>
 
 /* Specification.  */
-#if HAVE_OPENSSL_SHA512
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
 #include "sha512.h"
 
 #include <stdlib.h>
diff --git a/lib/sm3-stream.c b/lib/sm3-stream.c
index f9ed05a944..2a96fd734e 100644
--- a/lib/sm3-stream.c
+++ b/lib/sm3-stream.c
@@ -26,9 +26,6 @@
 #include <config.h>
 
 /* Specification.  */
-#if HAVE_OPENSSL_SM3
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
 #include "sm3.h"
 
 #include <stdlib.h>