diff options
| author | msvensson@neptunus.(none) <> | 2006-08-21 14:51:59 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-08-21 14:51:59 +0200 |
| commit | 2f0b080aeaa1afb8f58a730ba8ad4e586b8d4eb9 (patch) | |
| tree | cccd4922d2dd1b36cefe65c5a69782dd7b9c01b6 /extra/yassl | |
| parent | d04ce2df7aac75f1f6df4b5a0d6994e805ebdac6 (diff) | |
| download | mariadb-git-2f0b080aeaa1afb8f58a730ba8ad4e586b8d4eb9.tar.gz | |
Bug#19810 Bundled YASSL in libmysqlclient conflicts with OpenSSL
- Rename yaSSL version of 'SSL_peek' to 'yaSSL_peek' by using a macro
Diffstat (limited to 'extra/yassl')
| -rw-r--r-- | extra/yassl/include/openssl/prefix_ssl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extra/yassl/include/openssl/prefix_ssl.h b/extra/yassl/include/openssl/prefix_ssl.h index 7f815156f47..0d740b6b97e 100644 --- a/extra/yassl/include/openssl/prefix_ssl.h +++ b/extra/yassl/include/openssl/prefix_ssl.h @@ -150,3 +150,4 @@ #define MD5_Init yaMD5_Init #define MD5_Update yaMD5_Update #define MD5_Final yaMD5_Final +#define SSL_peek yaSSL_peek |