diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-10 10:12:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-10 10:12:50 +0000 |
| commit | b1f67da8b1b0cc93ea54a5c4ae89e6e835657729 (patch) | |
| tree | 58a5112492c1b23d03a7bf341d52de37330c9883 /app/xfs/os/io.c | |
| parent | ffd564eb05c09caff0dba3c4eb783739645a440e (diff) | |
update to xfs 1.1.0.
Diffstat (limited to 'app/xfs/os/io.c')
| -rw-r--r-- | app/xfs/os/io.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/app/xfs/os/io.c b/app/xfs/os/io.c index a5603e24f..13c7fe47e 100644 --- a/app/xfs/os/io.c +++ b/app/xfs/os/io.c @@ -1,4 +1,3 @@ -/* $Xorg: io.c,v 1.5 2001/02/09 02:05:44 xorgcvs Exp $ */ /* * i/o functions */ @@ -46,20 +45,17 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/io.c,v 3.18 2001/12/14 20:01:41 dawes Exp $ */ + +#include "xfs-config.h" #include <X11/Xtrans/Xtrans.h> #include <stdio.h> #include <errno.h> #include <sys/types.h> -#ifndef Lynx #include <sys/param.h> #ifndef __UNIXOS2__ #include <sys/uio.h> #endif -#else -#include <uio.h> -#endif #include <X11/fonts/FSproto.h> #include "clientstr.h" @@ -85,18 +81,6 @@ in this Software without prior written authorization from The Open Group. #endif - -extern fd_set ClientsWithInput; -extern fd_set ClientsWriteBlocked; -extern fd_set OutputPending; - -extern long OutputBufferSize; - -extern int ConnectionTranslation[]; - -extern Bool AnyClientsWriteBlocked; -extern Bool NewOutputPending; - static int timesThisConnection = 0; static ConnectionInputPtr FreeInputs = (ConnectionInputPtr) NULL; static ConnectionOutputPtr FreeOutputs = (ConnectionOutputPtr) NULL; @@ -628,7 +612,7 @@ AllocateInputBuffer(void) fsfree(oci); return (ConnectionInputPtr) NULL; } - oci->next = 0; + oci->next = NULL; oci->size = BUFSIZE; oci->bufptr = oci->buffer; oci->bufcnt = 0; |