diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | include/violite.h | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f0cdb32efbd..af3c6be0610 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -7,3 +7,4 @@ paul@central.snake.net sasha@mysql.sashanet.com tonu@hundin.mysql.fi tim@threads.polyesthetic.msg +tim@hundin.mysql.fi 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 */ |