diff options
| author | msvensson@shellback.(none) <> | 2006-05-05 10:35:12 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-05-05 10:35:12 +0200 |
| commit | 15ec5dfeca586ca90e798345a4d76ccf3540eec5 (patch) | |
| tree | 0143ae272227d05907a530f5c8473abff8e7cc05 /extra | |
| parent | 01faaacd2502419e3c7e15f15d2444af22f312da (diff) | |
| download | mariadb-git-15ec5dfeca586ca90e798345a4d76ccf3540eec5.tar.gz | |
Import from yaSSL
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/include/openssl/ssl.h | 9 | ||||
| -rw-r--r-- | extra/yassl/testsuite/test.hpp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h index 08075a8df5b..a7eca9138a2 100644 --- a/extra/yassl/include/openssl/ssl.h +++ b/extra/yassl/include/openssl/ssl.h @@ -32,12 +32,19 @@ #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 { extern "C" { diff --git a/extra/yassl/testsuite/test.hpp b/extra/yassl/testsuite/test.hpp index 7fe8656f6d2..259975fba0b 100644 --- a/extra/yassl/testsuite/test.hpp +++ b/extra/yassl/testsuite/test.hpp @@ -27,7 +27,7 @@ #endif /* _WIN32 */ -#if defined(__MACH__) || defined(_WIN32) +#if !defined(_SOCKLEN_T) && (defined(__MACH__) || defined(_WIN32)) typedef int socklen_t; #endif |