[src/trunk]: src PR# standards/16143: hide struct uio from userland behind a ...

[erh <erh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/01b351af54d1
branches:  trunk
changeset: 551885:01b351af54d1
user:      erh <erh%NetBSD.org@localhost>
date:      Sat Sep 13 16:59:29 2003 +0000

description:
PR# standards/16143: hide struct uio from userland behind a __UIO_EXPOSE
ifdef.  Define this when building ipf, since it shares code between the
kernel and userland and uses struct uio.

diffstat:

 sys/sys/uio.h             |  12 +++++++++++-
 usr.sbin/ipf/Makefile.inc |   4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r 5acf6febd0ff -r 01b351af54d1 sys/sys/uio.h
--- a/sys/sys/uio.h     Sat Sep 13 16:35:47 2003 +0000
+++ b/sys/sys/uio.h     Sat Sep 13 16:59:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uio.h,v 1.30 2003/08/07 16:34:21 agc Exp $     */
+/*     $NetBSD: uio.h,v 1.31 2003/09/13 16:59:29 erh Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1993, 1994
@@ -34,6 +34,12 @@
 #ifndef _SYS_UIO_H_
 #define        _SYS_UIO_H_
 
+#ifdef _KERNEL
+#ifndef __UIO_EXPOSE
+#define __UIO_EXPOSE
+#endif
+#endif
+
 #include <machine/ansi.h>
 #include <sys/featuretest.h>
 
@@ -68,6 +74,8 @@
        UIO_SYSSPACE            /* from system space */
 };
 
+#ifdef __UIO_EXPOSE
+
 struct uio {
        struct  iovec *uio_iov; /* pointer to array of iovecs */
        int     uio_iovcnt;     /* number of iovecs in array */
@@ -78,6 +86,8 @@
        struct  proc *uio_procp;/* process if UIO_USERSPACE */
 };
 
+#endif /* __UIO_EXPOSE */
+
 /*
  * Limits
  */
diff -r 5acf6febd0ff -r 01b351af54d1 usr.sbin/ipf/Makefile.inc
--- a/usr.sbin/ipf/Makefile.inc Sat Sep 13 16:35:47 2003 +0000
+++ b/usr.sbin/ipf/Makefile.inc Sat Sep 13 16:59:29 2003 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile.inc,v 1.9 2002/09/18 03:54:30 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.10 2003/09/13 16:59:30 erh Exp $
 
 .include <bsd.own.mk>
 
 CPPFLAGS+=-I${NETBSDSRCDIR}/sys -I${NETBSDSRCDIR}/sys/netinet
-CPPFLAGS+=-DUSE_INET6 -DSTATETOP
+CPPFLAGS+=-DUSE_INET6 -DSTATETOP -D__UIO_EXPOSE
 
 .PATH: ${NETBSDSRCDIR}/dist/ipf \
        ${NETBSDSRCDIR}/dist/ipf/man