diff options
| author | unknown <tim@hundin.mysql.fi> | 2001-06-05 04:18:23 +0300 |
|---|---|---|
| committer | unknown <tim@hundin.mysql.fi> | 2001-06-05 04:18:23 +0300 |
| commit | db6d4e9faa10316d04a942eb6454470ff0c86951 (patch) | |
| tree | 38a5cd43a0bac54f27d50d8f049f6c1ff61dc94c /include | |
| parent | 53b24302185eb7cc9e3481fd48dc91f633e445c2 (diff) | |
| parent | d637e1dcd5b2bec697e1fab2118ba9ffc88afcb5 (diff) | |
| download | mariadb-git-db6d4e9faa10316d04a942eb6454470ff0c86951.tar.gz | |
Merge work:/my/mysql-4.0 into hundin.mysql.fi:/home/tim/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'include')
| -rw-r--r-- | include/violite.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/violite.h b/include/violite.h index ffef4d68c73..a94f6787731 100644 --- a/include/violite.h +++ b/include/violite.h @@ -143,10 +143,6 @@ extern "C" { void vio_ssl_delete(Vio* vio); -#ifdef EMBEDDED_LIBRARY -void vio_reset(Vio *vio); -#endif - int vio_ssl_read(Vio* vio,gptr buf, int size); int vio_ssl_write(Vio* vio,const gptr buf,int size); int vio_ssl_blocking(Vio* vio,my_bool onoff); @@ -220,6 +216,7 @@ Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); #define HANDLE void * #endif +#ifndef EMBEDDED_LIBRARY /* This structure is for every connection on both sides */ struct st_vio { @@ -254,5 +251,5 @@ struct st_vio #endif /* HAVE_OPENSSL */ #endif /* HAVE_VIO */ }; - +#endif /* EMBEDDED_LIBRARY */ |