diff options
| author | bde <bde@FreeBSD.org> | 1997-12-19 10:03:31 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-12-19 10:03:31 +0000 |
| commit | 254d5ecb9e0d7b328c5b594da34d213b51b542c1 (patch) | |
| tree | 8a83930c12db4684c452d91d6aa1b6e7dd5aa4a7 | |
| parent | 6c0f717b7e39669dd702fa25ae890b962c770863 (diff) | |
| download | FreeBSD-src-254d5ecb9e0d7b328c5b594da34d213b51b542c1.zip FreeBSD-src-254d5ecb9e0d7b328c5b594da34d213b51b542c1.tar.gz | |
Fixed namespace pollution in previous commit.
Merged KERNEL ifdefs.
| -rw-r--r-- | sys/sys/uio.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/sys/uio.h b/sys/sys/uio.h index ab577fc..ca61e66 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -31,14 +31,12 @@ * SUCH DAMAGE. * * @(#)uio.h 8.5 (Berkeley) 2/22/94 - * $Id: uio.h,v 1.6 1997/02/22 09:46:19 peter Exp $ + * $Id: uio.h,v 1.7 1997/12/19 09:03:37 dyson Exp $ */ #ifndef _SYS_UIO_H_ #define _SYS_UIO_H_ -struct vm_object; - /* * XXX * iov_base should be a void *. @@ -59,6 +57,7 @@ enum uio_seg { }; #ifdef KERNEL + struct uio { struct iovec *uio_iov; int uio_iovcnt; @@ -74,9 +73,8 @@ struct uio { */ #define UIO_MAXIOV 1024 /* max 1K of iov's */ #define UIO_SMALLIOV 8 /* 8 on stack, else malloc */ -#endif /* KERNEL */ -#ifdef KERNEL +struct vm_object; int uiomove __P((caddr_t, int, struct uio *)); int uiomoveco __P((caddr_t, int, struct uio *, struct vm_object *)); |
