From: Chris Hanson Date: Sun, 23 Oct 2005 21:10:02 +0000 (+0000) Subject: Use new argument to TEST-FOR-IO-ON-CHANNEL. X-Git-Tag: 20090517-FFI~1209 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c0ecc83ac83ab34b51355211a6d7200b2cc69e46;p=mit-scheme.git Use new argument to TEST-FOR-IO-ON-CHANNEL. --- diff --git a/v7/src/edwin/tterm.scm b/v7/src/edwin/tterm.scm index ef56c565a..c846dc192 100644 --- a/v7/src/edwin/tterm.scm +++ b/v7/src/edwin/tterm.scm @@ -1,9 +1,9 @@ #| -*-Scheme-*- -$Id: tterm.scm,v 1.40 2004/02/16 05:43:59 cph Exp $ +$Id: tterm.scm,v 1.41 2005/10/23 21:07:19 cph Exp $ Copyright 1990,1991,1993,1994,1998,1999 Massachusetts Institute of Technology -Copyright 2001,2002,2003,2004 Massachusetts Institute of Technology +Copyright 2001,2002,2003,2004,2005 Massachusetts Institute of Technology This file is part of MIT/GNU Scheme. @@ -248,10 +248,7 @@ USA. ((not have-select?) (and block? (read-event block?))) (else - (case (test-for-io-on-descriptor - (channel-descriptor-for-select channel) - block? - 'READ) + (case (test-for-io-on-channel channel 'READ block?) ((#F) #f) ((PROCESS-STATUS-CHANGE) event:process-status) ((INTERRUPT) (loop)) diff --git a/v7/src/runtime/socket.scm b/v7/src/runtime/socket.scm index 25f0ce73e..32b844c71 100644 --- a/v7/src/runtime/socket.scm +++ b/v7/src/runtime/socket.scm @@ -1,9 +1,9 @@ #| -*-Scheme-*- -$Id: socket.scm,v 1.25 2004/02/16 05:38:23 cph Exp $ +$Id: socket.scm,v 1.26 2005/10/23 21:10:02 cph Exp $ Copyright 1996,1997,1998,1999,2001,2002 Massachusetts Institute of Technology -Copyright 2003,2004 Massachusetts Institute of Technology +Copyright 2003,2004,2005 Massachusetts Institute of Technology This file is part of MIT/GNU Scheme. @@ -94,7 +94,9 @@ USA. (let ((do-test (lambda (k) (let ((result - (test-for-io-on-channel server-socket 'READ))) + (test-for-io-on-channel server-socket + 'READ + block?))) (case result ((READ) (open-channel