diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-04-28 19:05:57 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-04-28 19:05:57 +0300 |
| commit | 68faea2eaa718bf3fe46e1c3f328346f7fd92f7e (patch) | |
| tree | 96d5e3ccb7f58564a76e77f8eb11b497988864dc /include | |
| parent | 8a05f5c7f497ff483f711dee55d3a1e7f5fe7e6a (diff) | |
| download | mariadb-git-68faea2eaa718bf3fe46e1c3f328346f7fd92f7e.tar.gz | |
Fix to remove compiler warnings
include/my_global.h:
Fixed wrong #ifdef
include/violite.h:
Fix to remove compiler warning
libmysqld/libmysqld.c:
Fix to remove compiler warning
myisam/sort.c:
Fix to remove compiler warning
myisammrg/myrg_extra.c:
Fix to remove compiler warning
vio/viossl.c:
Fix to remove compiler warning
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/violite.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/my_global.h b/include/my_global.h index b979cd5955a..98034fc1cff 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -268,7 +268,7 @@ C_MODE_END #endif #include <errno.h> /* Recommended by debian */ /* We need the following to go around a problem with openssl on solaris */ -#if defined(HAVE_CRYPT) +#if defined(HAVE_CRYPT_H) #include <crypt.h> #endif diff --git a/include/violite.h b/include/violite.h index a328e51253a..d20fab23239 100644 --- a/include/violite.h +++ b/include/violite.h @@ -148,7 +148,7 @@ my_bool vio_ssl_should_retry(Vio* vio); int vio_ssl_close(Vio* vio); /* Return last error number */ int vio_ssl_errno(Vio *vio); -my_bool vio_ssl_peer_addr(Vio* vio, char *buf); +my_bool vio_ssl_peer_addr(Vio* vio, char *buf, uint16 *port); void vio_ssl_in_addr(Vio *vio, struct in_addr *in); int vio_ssl_blocking(Vio * vio, my_bool set_blocking_mode, my_bool *old_mode); @@ -224,7 +224,7 @@ struct st_vio my_bool (*is_blocking)(Vio*); int (*viokeepalive)(Vio*, my_bool); int (*fastsend)(Vio*); - my_bool (*peer_addr)(Vio*, gptr, uint16*); + my_bool (*peer_addr)(Vio*, char *, uint16*); void (*in_addr)(Vio*, struct in_addr*); my_bool (*should_retry)(Vio*); int (*vioclose)(Vio*); |