summaryrefslogtreecommitdiff
path: root/extra/yassl
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-05-31 22:19:17 +0200
committerunknown <msvensson@shellback.(none)>2006-05-31 22:19:17 +0200
commit2f4bfdf04361b09897bca0e56e084e7c93f3b2c3 (patch)
tree4ec6b138804f00bcf033590d164e1f43a76977b2 /extra/yassl
parent8ef2e85fa50c6ced513a3260b1a257cc128747ad (diff)
downloadmariadb-git-2f4bfdf04361b09897bca0e56e084e7c93f3b2c3.tar.gz
Import from yaSSL
extra/yassl/include/openssl/crypto.h: Import patch yassl.diff extra/yassl/include/openssl/ssl.h: Import patch yassl.diff
Diffstat (limited to 'extra/yassl')
-rw-r--r--extra/yassl/include/openssl/crypto.h2
-rw-r--r--extra/yassl/include/openssl/ssl.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/extra/yassl/include/openssl/crypto.h b/extra/yassl/include/openssl/crypto.h
index 12b7ea0e92d..288990e1318 100644
--- a/extra/yassl/include/openssl/crypto.h
+++ b/extra/yassl/include/openssl/crypto.h
@@ -3,7 +3,9 @@
#ifndef ysSSL_crypto_h__
#define yaSSL_crypto_h__
+#ifdef YASSL_PREFIX
#include "prefix_crypto.h"
+#endif
const char* SSLeay_version(int type);
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h
index 704f91e40a7..21fd1a0d21a 100644
--- a/extra/yassl/include/openssl/ssl.h
+++ b/extra/yassl/include/openssl/ssl.h
@@ -28,7 +28,10 @@
#ifndef yaSSL_openssl_h__
#define yaSSL_openssl_h__
+#ifdef YASSL_PREFIX
#include "prefix_ssl.h"
+#endif
+
#include <stdio.h> /* ERR_print fp */
#include "opensslv.h" /* for version number */
#include "rsa.h"