diff options
author | guenther <guenther@openbsd.org> | 2012-10-01 00:21:19 +0000 |
---|---|---|
committer | guenther <guenther@openbsd.org> | 2012-10-01 00:21:19 +0000 |
commit | 2c79e7cc0b05cb2f01285667dfeb25fbbcc2675d (patch) | |
tree | 0227919b0dff431e0b8bf2121627dc8a42d2ccec /sys/sys/uio.h | |
parent | Make groupmember() check the effective gid too, so that the checks are (diff) | |
download | wireguard-openbsd-2c79e7cc0b05cb2f01285667dfeb25fbbcc2675d.tar.xz wireguard-openbsd-2c79e7cc0b05cb2f01285667dfeb25fbbcc2675d.zip |
More compliance fixes: hiding non-standard stuff behind __BSD_VISIBLE,
making files stand-alone, some __restrict additions.
tweaks kettenis@; ports testing and fixes landry@ and jasper@
ok millert@
Diffstat (limited to 'sys/sys/uio.h')
-rw-r--r-- | sys/sys/uio.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/sys/sys/uio.h b/sys/sys/uio.h index e6e2676e4c2..5a82a5af812 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uio.h,v 1.15 2010/07/26 01:56:27 guenther Exp $ */ +/* $OpenBSD: uio.h,v 1.16 2012/10/01 00:21:20 guenther Exp $ */ /* $NetBSD: uio.h,v 1.12 1996/02/09 18:25:45 christos Exp $ */ /* @@ -35,11 +35,25 @@ #ifndef _SYS_UIO_H_ #define _SYS_UIO_H_ +#include <sys/cdefs.h> +#include <sys/_types.h> + +#ifndef _SIZE_T_DEFINED_ +#define _SIZE_T_DEFINED_ +typedef __size_t size_t; +#endif + +#ifndef _SSIZE_T_DEFINED_ +#define _SSIZE_T_DEFINED_ +typedef __ssize_t ssize_t; +#endif + struct iovec { void *iov_base; /* Base address. */ size_t iov_len; /* Length. */ }; +#if __BSD_VISIBLE /* needed by kdump */ enum uio_rw { UIO_READ, UIO_WRITE }; /* Segment flag values. */ @@ -47,6 +61,7 @@ enum uio_seg { UIO_USERSPACE, /* from user data space */ UIO_SYSSPACE /* from system space */ }; +#endif /* __BSD_VISIBLE */ #ifdef _KERNEL struct uio { @@ -65,11 +80,11 @@ struct uio { #define UIO_SMALLIOV 8 /* 8 on stack, else malloc */ #endif /* _KERNEL */ +#if __BSD_VISIBLE #define UIO_MAXIOV 1024 /* Deprecated, use IOV_MAX instead */ +#endif #ifndef _KERNEL -#include <sys/cdefs.h> - __BEGIN_DECLS #if __BSD_VISIBLE ssize_t preadv(int, const struct iovec *, int, off_t); |