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/viosocket.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/viosocket.c')
| -rw-r--r-- | vio/viosocket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 904b75583a9..c7561890ead 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -82,7 +82,7 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode, DBUG_PRINT("enter", ("set_blocking_mode: %d old_mode: %d", (int) set_blocking_mode, (int) *old_mode)); -#if !defined(___WIN__) && !defined(__EMX__) +#if !defined(__WIN__) && !defined(__EMX__) #if !defined(NO_FCNTL_NONBLOCK) if (vio->sd >= 0) { @@ -115,7 +115,7 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode, vio->fcntl_mode |= O_NONBLOCK; /* set bit */ } if (old_fcntl != vio->fcntl_mode) - r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg)); + r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg); } #ifndef __EMX__ else |