diff options
| author | unknown <reggie@linux.site> | 2005-07-12 10:31:09 -0600 |
|---|---|---|
| committer | unknown <reggie@linux.site> | 2005-07-12 10:31:09 -0600 |
| commit | 73fd169d0215700583f335c6e42243e3fa1553c4 (patch) | |
| tree | 064a0becf332b11c51aa50216454f07e4b8581a6 /vio/vio.c | |
| parent | 2bca6451f78d22fe4bc3c5c5b488b57cb9389492 (diff) | |
| download | mariadb-git-73fd169d0215700583f335c6e42243e3fa1553c4.tar.gz | |
Fixed some vio code that was using ___WIN__ instead of __WIN__
include/my_global.h:
set SOCKET_EWOULDBLOCK to the proper windows def WSAEWOULDBLOCK
sql/net_serv.cc:
fixed typo with using 3 leading underscores instead of 2
vio/vio.c:
fixed typo with using 3 leading underscores instead of 2
vio/viosocket.c:
fixed typo with using 3 leading underscores instead of 2
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/vio.c b/vio/vio.c index 978780d2632..4660efe3048 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -130,7 +130,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) sprintf(vio->desc, (vio->type == VIO_TYPE_SOCKET ? "socket (%d)" : "TCP/IP (%d)"), vio->sd); -#if !defined(___WIN__) && !defined(__EMX__) && !defined(OS2) +#if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) #if !defined(NO_FCNTL_NONBLOCK) #if defined(__FreeBSD__) fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */ @@ -145,7 +145,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) { /* set to blocking mode by default */ ulong arg=0, r; - r = ioctlsocket(sd,FIONBIO,(void*) &arg, sizeof(arg)); + r = ioctlsocket(sd,FIONBIO,(void*) &arg); vio->fcntl_mode &= ~O_NONBLOCK; } #endif |