bk commit into 5.0 tree (msvensson:1.2114)

[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.2114 06/05/05 10:35:12 msvensson@shellback.(none) +2 -0
  Import from yaSSL

  extra/yassl/testsuite/test.hpp
    1.3 06/05/05 10:32:04 msvensson@shellback.(none)[msvensson] +1 -1
    Import patch yassl.diff

  extra/yassl/include/openssl/ssl.h
    1.10 06/05/05 10:26:02 msvensson@shellback.(none)[msvensson] +8 -1
    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/my50-maint-yassl

--- 1.2/extra/yassl/testsuite/test.hpp	2006-04-24 23:55:04 +02:00
+++ 1.3/extra/yassl/testsuite/test.hpp	2006-05-05 10:32:04 +02:00
@@ -27,7 +27,7 @@
 #endif /* _WIN32 */
 
 
-#if defined(__MACH__) || defined(_WIN32)
+#if !defined(_SOCKLEN_T) && (defined(__MACH__) || defined(_WIN32))
     typedef int socklen_t;
 #endif
 

--- 1.9/extra/yassl/include/openssl/ssl.h	2006-05-04 22:23:38 +02:00
+++ 1.10/extra/yassl/include/openssl/ssl.h	2006-05-05 10:26:02 +02:00
@@ -32,11 +32,18 @@
 #include "opensslv.h" /* for version number */
 #include "rsa.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
-extern "C" void yaSSL_CleanUp();   /* call once at end of application use to
+ void yaSSL_CleanUp();   /* call once at end of application use to
                                       free static singleton memory holders,
                                       not a leak per se, but helpful when 
                                       looking for them                      */
+
+#if defined(__cplusplus)
+} // extern
+#endif
 
 #if defined(__cplusplus) && !defined(YASSL_MYSQL_COMPATIBLE)
 namespace yaSSL {