diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-23 17:15:44 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-23 17:15:44 +0100 |
| commit | 5c796b52eeb027d41d03bcc2196f796a417a2cd2 (patch) | |
| tree | a7cd3cf2a840dba3678376d95e1349a983d50577 /extra/yassl/testsuite/testsuite.cpp | |
| parent | 562e097ac475039dd25201ff5fc071d8eef8b1a6 (diff) | |
| parent | e88de826e608adb4cb46e145a088e8412d53d240 (diff) | |
| download | mariadb-git-5c796b52eeb027d41d03bcc2196f796a417a2cd2.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/taocrypt/src/integer.cpp:
Auto merged
extra/yassl/taocrypt/test/test.cpp:
Auto merged
extra/yassl/testsuite/testsuite.cpp:
Auto merged
Diffstat (limited to 'extra/yassl/testsuite/testsuite.cpp')
| -rw-r--r-- | extra/yassl/testsuite/testsuite.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/testsuite/testsuite.cpp b/extra/yassl/testsuite/testsuite.cpp index 1cf6a78ebe7..3cd832ebb03 100644 --- a/extra/yassl/testsuite/testsuite.cpp +++ b/extra/yassl/testsuite/testsuite.cpp @@ -7,7 +7,7 @@ typedef unsigned char byte; void taocrypt_test(void*); -void file_test(char*, byte*); +void file_test(const char*, byte*); void client_test(void*); void echoclient_test(void*); |