From: Richard Levitte Date: Thu, 1 Aug 2002 19:31:15 +0000 (+0000) Subject: Avoid yet another name clash with libdes, and make the declaration consistent X-Git-Tag: OpenSSL_0_9_7-beta4~231 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=162d858a9019670d9d622286f3e675372ae387ec;p=oweals%2Fopenssl.git Avoid yet another name clash with libdes, and make the declaration consistent with the definition. --- diff --git a/crypto/des/des_ver.h b/crypto/des/des_ver.h index 0fa94d5368..379bbadda2 100644 --- a/crypto/des/des_ver.h +++ b/crypto/des/des_ver.h @@ -63,5 +63,9 @@ # define OPENSSL_EXTERN OPENSSL_EXPORT #endif -OPENSSL_EXTERN char *DES_version; /* SSLeay version string */ -OPENSSL_EXTERN char *libdes_version; /* old libdes version string */ +/* The following macros make sure the names are different from libdes names */ +#define DES_version OSSL_DES_version +#define libdes_version OSSL_libdes_version + +OPENSSL_EXTERN const char *OSSL_DES_version; /* SSLeay version string */ +OPENSSL_EXTERN const char *OSSL_libdes_version; /* old libdes version string */ diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index 4650f2fa0f..1b70f68806 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -57,6 +57,7 @@ */ #include "des_locl.h" +#include "des_ver.h" #include "spr.h" #include