diff options
| author | monty@donna.mysql.com <> | 2001-02-07 23:27:19 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-02-07 23:27:19 +0200 |
| commit | 059ad7f078297881fefeff7df2bc5795298f54fd (patch) | |
| tree | d7fa348f41efb0b9fb57e0fe2b6be333f71433cb /sql/violite.c | |
| parent | d487e5a9b1702ffaeb7afd8656cd811be1493576 (diff) | |
| download | mariadb-git-059ad7f078297881fefeff7df2bc5795298f54fd.tar.gz | |
Force sockets to be blocking on HPUX 11.0
Changed BITMAP to MY_BITMAP to avoid type conflict on windows
Diffstat (limited to 'sql/violite.c')
| -rw-r--r-- | sql/violite.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/violite.c b/sql/violite.c index 25ab5db31d2..6594261172e 100644 --- a/sql/violite.c +++ b/sql/violite.c @@ -35,11 +35,13 @@ #ifdef HAVE_POLL #include <sys/poll.h> #endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif #if defined(__EMX__) -#include <sys/ioctl.h> #define ioctlsocket ioctl -#endif /* defined(__EMX__) */ +#endif /* defined(__EMX__) */ #if defined(MSDOS) || defined(__WIN__) #ifdef __WIN__ @@ -106,6 +108,9 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) #if !defined(___WIN__) && !defined(__EMX__) #if !defined(NO_FCNTL_NONBLOCK) vio->fcntl_mode = fcntl(sd, F_GETFL); +#elif defined(HAVE_SYS_IOCTL_H) /* hpux */ + /* Non blocking sockets doesn't work good on HPUX 11.0 */ + (void) ioctl(net->fd,FIOSNBIO,0); #endif #else /* !defined(__WIN__) && !defined(__EMX__) */ { |