1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
This commit is contained in:
cmiller@zippy.cornsilk.net 2006-09-05 13:53:06 -04:00
commit e5669a6527
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/yassl/include/openssl/generate_prefix_files.pl
View File

@ -30,7 +30,7 @@ sub generate_prefix($$)
next; 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"; print OUT "#define $1 ya$1\n";
} }

3
extra/yassl/taocrypt/src/misc.cpp
View File

@ -29,7 +29,7 @@
#include "runtime.hpp" #include "runtime.hpp"
#include "misc.hpp" #include "misc.hpp"
#if !defined(YASSL_MYSQL_COMPATIBLE)
extern "C" { extern "C" {
// for libcurl configure test, these are the signatures they use // for libcurl configure test, these are the signatures they use
@ -37,6 +37,7 @@ extern "C" {
char CRYPTO_lock() { return 0;} char CRYPTO_lock() { return 0;}
char CRYPTO_add_lock() { return 0;} char CRYPTO_add_lock() { return 0;}
} // extern "C" } // extern "C"
#endif
#ifdef YASSL_PURE_C #ifdef YASSL_PURE_C