]> Savannah Git Hosting - gnulib.git/commitdiff
md5-stream, sha*-stream, sm3-stream: Avoid duplicate symbols.
authorJan Palus <jpalus@fastmail.com>
Sun, 17 Nov 2024 17:58:42 +0000 (18:58 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 17 Nov 2024 18:04:44 +0000 (19:04 +0100)
* 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

ChangeLog
lib/md5-stream.c
lib/sha1-stream.c
lib/sha256-stream.c
lib/sha512-stream.c
lib/sm3-stream.c

index 29e81ac19ff0cc14ee6ee127b8c47b3775cbfc9a..888555448b9864236eff08debbd03bf9f297ea0b 100644 (file)
--- 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
index fdd2bd8b4bf85a29d95ca220d84f95a2c3fcca93..2cbdda6b0faaf8ef4d3d6be129f126b1167ac55a 100644 (file)
@@ -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>
index cbdf95ab7646ffe7f2d04af4a11089ec89eefd26..b713e678a65cffb0d815913958e5699b944a7168 100644 (file)
@@ -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>
index 690ca967ddaeabec0fa5b7b21e5a8a70b7db7bf4..82abc2c8afd85963b83c07dcb52accffa38fca24 100644 (file)
@@ -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>
index 74fdd5047dc6132a5fec9049fc32e240ca87fcbe..6362e55a6a6685f67108be89f657c18302bacd23 100644 (file)
@@ -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>
index f9ed05a944380afd1eafade165c8257295bf312a..2a96fd734eac6d01990fb9c79f7e2e61a2d63542 100644 (file)
@@ -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>