diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 13:53:06 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 13:53:06 -0400 |
| commit | 15bd39451b389fa2a123de2c3bbb44c19643cad6 (patch) | |
| tree | c65d9085a0c025d0892f687599c52f89bc09cf1d /extra | |
| parent | 5c5e0f5c1a547963edcfac5c2500fc2e9f4aacd2 (diff) | |
| parent | b0cdb895e4154d3d131268d8181193bad82086c2 (diff) | |
| download | mariadb-git-15bd39451b389fa2a123de2c3bbb44c19643cad6.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/yassl/include/openssl/generate_prefix_files.pl | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/misc.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extra/yassl/include/openssl/generate_prefix_files.pl b/extra/yassl/include/openssl/generate_prefix_files.pl index b921ee11e9a..da591b31332 100755 --- a/extra/yassl/include/openssl/generate_prefix_files.pl +++ b/extra/yassl/include/openssl/generate_prefix_files.pl @@ -30,7 +30,7 @@ sub generate_prefix($$) next; } - if ( /^\s*[a-zA-Z0-9*_ ]+\s+([_a-zA-Z0-9]+)\s*\(/ ) + if ( /^\s*[a-zA-Z0-9*_ ]+\s+\*?([_a-zA-Z0-9]+)\s*\(/ ) { print OUT "#define $1 ya$1\n"; } diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp index b8095334789..a33ca4fa432 100644 --- a/extra/yassl/taocrypt/src/misc.cpp +++ b/extra/yassl/taocrypt/src/misc.cpp @@ -29,7 +29,7 @@ #include "runtime.hpp" #include "misc.hpp" - +#if !defined(YASSL_MYSQL_COMPATIBLE) extern "C" { // for libcurl configure test, these are the signatures they use @@ -37,6 +37,7 @@ extern "C" { char CRYPTO_lock() { return 0;} char CRYPTO_add_lock() { return 0;} } // extern "C" +#endif #ifdef YASSL_PURE_C |