diff options
author | Richard Levitte <levitte@openssl.org> | 2002-08-01 19:30:58 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2002-08-01 19:30:58 +0000 |
commit | 44c09667ffb6c71f3a3173cc27fa44eb7e428baa (patch) | |
tree | 41a43b2a5f8865d54566e29fa37bbd8a30ed054c | |
parent | da9b97246695c370702d15be2b3778427cf57082 (diff) | |
download | openssl-44c09667ffb6c71f3a3173cc27fa44eb7e428baa.tar.gz |
Avoid yet another name clash with libdes, and make the declaration consistent
with the definition.
-rw-r--r-- | crypto/des/des_ver.h | 8 | ||||
-rw-r--r-- | crypto/des/ecb_enc.c | 1 |
2 files changed, 7 insertions, 2 deletions
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 <openssl/opensslv.h> |