diff options
Diffstat (limited to 'xc/lib/FS/FSConnServ.c')
| -rw-r--r-- | xc/lib/FS/FSConnServ.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/xc/lib/FS/FSConnServ.c b/xc/lib/FS/FSConnServ.c index a560721da..850d367e7 100644 --- a/xc/lib/FS/FSConnServ.c +++ b/xc/lib/FS/FSConnServ.c @@ -46,7 +46,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.7 2001/01/17 19:41:28 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.9 2001/07/25 15:04:42 dawes Exp $ */ #include <stdio.h> #include "FSlibint.h" @@ -64,11 +64,6 @@ in this Software without prior written authorization from The Open Group. #endif #endif -#ifdef MINIX -#include <sys/nbio.h> -#define select(n,r,w,x,t) nbio_select(n,r,w,x,t) -#endif - /* * Attempts to connect to server, given server name. Returns transport * connection object or NULL if connection fails. @@ -140,10 +135,7 @@ _FSDisconnectServer(trans_conn) (void) _FSTransClose(trans_conn); } -#ifndef __NetBSD__ -#undef NULL -#define NULL ((char *) 0) -#endif + /* * This is an OS dependent routine which: * 1) returns as soon as the connection can be written on.... @@ -165,20 +157,7 @@ void _FSWaitForWritable(svr) FD_SET(svr->fd, &w_mask); do { -#ifndef AMOEBA nfound = Select(svr->fd + 1, &r_mask, &w_mask, NULL, NULL); -#else /* AMOEBA */ - if (_FSTransAmSelect(svr->fd, 0) > 0) { - BITSET(r_mask, svr->fd); - } else { - CLEARBITS(r_mask); - } - /* Always immediately writable because data is enqueued to be - * written by separate virtual circuit threads. - */ - nfound = 1; - BITSET(w_mask, svr->fd); -#endif /* AMOEBA */ if (nfound < 0 && !ECHECK(EINTR)) (*_FSIOErrorFunction) (svr); } while (nfound <= 0); @@ -235,15 +214,7 @@ void _FSWaitForReadable(svr) FD_ZERO(&r_mask); do { FD_SET(svr->fd, &r_mask); -#ifndef AMOEBA result = Select(svr->fd + 1, &r_mask, NULL, NULL, NULL); -#else - if ((result = _FSTransAmSelect(svr->fd, 0)) > 0) { - BITSET(r_mask, svr->fd); - } else { - CLEARBITS(r_mask); - } -#endif if (result == -1 && !ECHECK(EINTR)) (*_FSIOErrorFunction) (svr); } while (result <= 0); |