aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/des/des_ver.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2002-08-01 19:30:58 +0000
committerRichard Levitte <levitte@openssl.org>2002-08-01 19:30:58 +0000
commit44c09667ffb6c71f3a3173cc27fa44eb7e428baa (patch)
tree41a43b2a5f8865d54566e29fa37bbd8a30ed054c /crypto/des/des_ver.h
parentda9b97246695c370702d15be2b3778427cf57082 (diff)
downloadopenssl-44c09667ffb6c71f3a3173cc27fa44eb7e428baa.tar.gz
Avoid yet another name clash with libdes, and make the declaration consistent
with the definition.
Diffstat (limited to 'crypto/des/des_ver.h')
-rw-r--r--crypto/des/des_ver.h8
1 files changed, 6 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 */