diff options
| author | phk <phk@FreeBSD.org> | 2004-12-22 17:37:14 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-22 17:37:14 +0000 |
| commit | fbe7293f5ae054b20e8c917b015740ed4103c78c (patch) | |
| tree | 7c0f42e55abb7b2a8a263dad9f0d0cb17023a514 /sys/kern | |
| parent | 66e2363925306e9d5b3b904b85128aaa32f9ba46 (diff) | |
| download | FreeBSD-src-fbe7293f5ae054b20e8c917b015740ed4103c78c.zip FreeBSD-src-fbe7293f5ae054b20e8c917b015740ed4103c78c.tar.gz | |
Include uio.h
Check O_NONBLOCK instead if IO_NDELAY
Don't include vnode.h
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/tty_pty.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 89d1b36..65827d9 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include <sys/fcntl.h> #include <sys/poll.h> #include <sys/kernel.h> -#include <sys/vnode.h> +#include <sys/uio.h> #include <sys/signalvar.h> #include <sys/malloc.h> @@ -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) |
