summaryrefslogtreecommitdiff
path: root/sql/violite.c
diff options
context:
space:
mode:
Diffstat (limited to 'sql/violite.c')
-rw-r--r--sql/violite.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/violite.c b/sql/violite.c
index 4efda9f3b90..253ef7bb468 100644
--- a/sql/violite.c
+++ b/sql/violite.c
@@ -38,8 +38,7 @@
#if defined(__EMX__)
#include <sys/ioctl.h>
-#define ioctlsocket(A,B,C) ioctl((A),(B),(void *)(C),sizeof(*(C)))
-#undef HAVE_FCNTL
+#define ioctlsocket ioctl
#endif /* defined(__EMX__) */
#if defined(MSDOS) || defined(__WIN__)
@@ -111,7 +110,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
#else /* !defined(__WIN__) && !defined(__EMX__) */
{
/* set to blocking mode by default */
- ulong arg=0;
+ ulong arg=0, r;
r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg));
}
#endif