From 40b5a6f2c6b0c55e10934fd82d4d845b925748da Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 22 Dec 2004 17:37:14 +0000 Subject: [PATCH] Include uio.h Check O_NONBLOCK instead if IO_NDELAY Don't include vnode.h --- sys/kern/tty_pty.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 89d1b36124a2..65827d9111be 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include @@ -361,7 +361,7 @@ ptcread(struct cdev *dev, struct uio *uio, int flag) } if ((tp->t_state & TS_CONNECTED) == 0) return (0); /* EOF */ - if (flag & IO_NDELAY) + if (flag & O_NONBLOCK) return (EWOULDBLOCK); error = tsleep(TSA_PTC_READ(tp), TTIPRI | PCATCH, "ptcin", 0); if (error) @@ -497,7 +497,7 @@ block: uio->uio_resid += cc; return (EIO); } - if (flag & IO_NDELAY) { + if (flag & O_NONBLOCK) { /* adjust for data copied in but not written */ uio->uio_resid += cc; if (cnt == 0)