summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <tim@cane.mysql.fi>2000-12-21 11:54:08 +0200
committerunknown <tim@cane.mysql.fi>2000-12-21 11:54:08 +0200
commit33cc250f670574c05d5933049ed1f9c7e4b168fb (patch)
tree8289f700fb9c3073f20ac23cce22265f83601c39 /libmysql
parent27336dfe8fbd4e12b06e99778de5d8c1c7e837f0 (diff)
downloadmariadb-git-33cc250f670574c05d5933049ed1f9c7e4b168fb.tar.gz
Compatibility fix for BSDi.
BSDi uses size_t * for the optlen arg to getsockopt, while other Unixes use socklen_t *. acconfig.h: - compatibility fix for BSDi (getsockopt optlen type) configure.in: - compatibility fix for BSDi (getsockopt optlen type) libmysql/libmysql.c: - compatibility fix for BSDi (getsockopt optlen type) sql/mini_client.cc: - compatibility fix for BSDi (getsockopt optlen type)
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 9f71273b119..979ef6a4945 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -125,7 +125,7 @@ static int connect2(my_socket s, const struct sockaddr *name, uint namelen,
return connect(s, (struct sockaddr*) name, namelen);
#else
int flags, res, s_err;
- size_socket s_err_size = sizeof(uint);
+ SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint);
fd_set sfds;
struct timeval tv;
time_t start_time, now_time;