bk commit into 5.0 tree (msvensson:1.2157)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2157 06/05/31 22:19:17 msvensson@shellback.(none) +2 -0
  Import from yaSSL

  extra/yassl/include/openssl/ssl.h
    1.13 06/05/31 22:14:47 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/include/openssl/crypto.h
    1.3 06/05/31 22:14:47 msvensson@shellback.(none)[msvensson] +2 -0
    Import patch yassl.diff

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.2/extra/yassl/include/openssl/crypto.h	2006-05-31 16:19:00 +02:00
+++ 1.3/extra/yassl/include/openssl/crypto.h	2006-05-31 22:14:47 +02:00
@@ -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);
 

--- 1.12/extra/yassl/include/openssl/ssl.h	2006-05-31 16:32:02 +02:00
+++ 1.13/extra/yassl/include/openssl/ssl.h	2006-05-31 22:14:47 +02:00
@@ -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"