diff options
| author | unknown <tsmith@maint1.mysql.com> | 2007-06-15 19:06:06 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint1.mysql.com> | 2007-06-15 19:06:06 +0200 |
| commit | b6489c19c95c2217dc2dcad2b826b21ac90fc610 (patch) | |
| tree | c69e983c90b46ab7f92eaa45f5508e9498801f0b /include/violite.h | |
| parent | 6070617aed439a7a45326667606b48ebbc1c111d (diff) | |
| parent | 3982f318578e5c070228883e3214cb6e3c844c17 (diff) | |
| download | mariadb-git-b6489c19c95c2217dc2dcad2b826b21ac90fc610.tar.gz | |
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
include/violite.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
Auto merged
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h index 30796b13240..d49d0302b5e 100644 --- a/include/violite.h +++ b/include/violite.h @@ -100,7 +100,9 @@ my_bool vio_poll_read(Vio *vio,uint timeout); #define HEADER_DES_LOCL_H dummy_something #define YASSL_MYSQL_COMPATIBLE +#ifndef YASSL_PREFIX #define YASSL_PREFIX +#endif /* Set yaSSL to use same type as MySQL do for socket handles */ typedef my_socket YASSL_SOCKET_T; #define YASSL_SOCKET_T_DEFINED |