diff options
| author | unknown <msvensson@shellback.(none)> | 2006-08-31 15:16:44 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-08-31 15:16:44 +0200 |
| commit | 7fcf4b17d0ff76b525e7dc2c5ecac12f84d47bd7 (patch) | |
| tree | 2e67c174cd380b8725596550fed82299b73fc04d /extra | |
| parent | 4d13d1775d4a772e48e508949a1106155d41c192 (diff) | |
| download | mariadb-git-7fcf4b17d0ff76b525e7dc2c5ecac12f84d47bd7.tar.gz | |
Bug#21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps!
- Don't add the signatures for CRYPTO_* when compiling yaSSL for MySQL
extra/yassl/taocrypt/src/misc.cpp:
No need to include the CRYPTO_* when compiling yaSSL for MySQL
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/src/misc.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp index b8095334789..a33ca4fa432 100644 --- a/extra/yassl/taocrypt/src/misc.cpp +++ b/extra/yassl/taocrypt/src/misc.cpp @@ -29,7 +29,7 @@ #include "runtime.hpp" #include "misc.hpp" - +#if !defined(YASSL_MYSQL_COMPATIBLE) extern "C" { // for libcurl configure test, these are the signatures they use @@ -37,6 +37,7 @@ extern "C" { char CRYPTO_lock() { return 0;} char CRYPTO_add_lock() { return 0;} } // extern "C" +#endif #ifdef YASSL_PURE_C |