Fri Sep 30 10:23:03 2011 UTC ()
avoid sys/systm.h in userland ppath.h.
include types.h/stdarg.h in all systm.h configs.

my amd64 build without man pages now worked at least.


(mrg)
diff -r1.2 -r1.3 src/common/lib/libppath/ppath.c
diff -r1.249 -r1.250 src/sys/sys/systm.h
cvs diff -r1.2 -r1.3 src/common/lib/libppath/ppath.c (expand / switch to unified diff)

--- src/common/lib/libppath/ppath.c 2011/09/29 20:53:30 1.2
+++ src/common/lib/libppath/ppath.c 2011/09/30 10:23:03 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1/* $NetBSD: ppath.c,v 1.2 2011/09/29 20:53:30 christos Exp $ */ 1/* $NetBSD: ppath.c,v 1.3 2011/09/30 10:23:03 mrg Exp $ */
2/* $Id: ppath.c,v 1.2 2011/09/29 20:53:30 christos Exp $ */ 2/* $Id: ppath.c,v 1.3 2011/09/30 10:23:03 mrg Exp $ */
3/*- 3/*-
4 * Copyright (c) 2011 The NetBSD Foundation, Inc. 4 * Copyright (c) 2011 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by David Young <dyoung@NetBSD.org>. 8 * by David Young <dyoung@NetBSD.org>.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
@@ -20,29 +20,31 @@ @@ -20,29 +20,31 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__RCSID("$Id: ppath.c,v 1.2 2011/09/29 20:53:30 christos Exp $"); 33__RCSID("$Id: ppath.c,v 1.3 2011/09/30 10:23:03 mrg Exp $");
34 34
 35#ifdef _KERNEL
35#include <sys/systm.h> 36#include <sys/systm.h>
 37#endif
36#include <ppath/ppath.h> 38#include <ppath/ppath.h>
37#include <ppath/ppath_impl.h> 39#include <ppath/ppath_impl.h>
38 40
39enum _ppath_type { 41enum _ppath_type {
40 PPATH_T_IDX = 0 42 PPATH_T_IDX = 0
41 , PPATH_T_KEY = 1 43 , PPATH_T_KEY = 1
42}; 44};
43 45
44typedef enum _ppath_type ppath_type_t; 46typedef enum _ppath_type ppath_type_t;
45 47
46struct _ppath_component { 48struct _ppath_component {
47 unsigned int pc_refcnt; 49 unsigned int pc_refcnt;
48 ppath_type_t pc_type; 50 ppath_type_t pc_type;
cvs diff -r1.249 -r1.250 src/sys/sys/systm.h (expand / switch to unified diff)

--- src/sys/sys/systm.h 2011/09/29 20:52:12 1.249
+++ src/sys/sys/systm.h 2011/09/30 10:23:03 1.250
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: systm.h,v 1.249 2011/09/29 20:52:12 christos Exp $ */ 1/* $NetBSD: systm.h,v 1.250 2011/09/30 10:23:03 mrg Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1982, 1988, 1991, 1993 4 * Copyright (c) 1982, 1988, 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * (c) UNIX System Laboratories, Inc. 6 * (c) UNIX System Laboratories, Inc.
7 * All or some portions of this file are derived from material licensed 7 * All or some portions of this file are derived from material licensed
8 * to the University of California by American Telephone and Telegraph 8 * to the University of California by American Telephone and Telegraph
9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 9 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
10 * the permission of UNIX System Laboratories, Inc. 10 * the permission of UNIX System Laboratories, Inc.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -36,30 +36,28 @@ @@ -36,30 +36,28 @@
36 * @(#)systm.h 8.7 (Berkeley) 3/29/95 36 * @(#)systm.h 8.7 (Berkeley) 3/29/95
37 */ 37 */
38 38
39#ifndef _SYS_SYSTM_H_ 39#ifndef _SYS_SYSTM_H_
40#define _SYS_SYSTM_H_ 40#define _SYS_SYSTM_H_
41 41
42#if defined(_KERNEL_OPT) 42#if defined(_KERNEL_OPT)
43#include "opt_ddb.h" 43#include "opt_ddb.h"
44#include "opt_multiprocessor.h" 44#include "opt_multiprocessor.h"
45#endif 45#endif
46 46
47#include <machine/endian.h> 47#include <machine/endian.h>
48 48
49#ifdef _KERNEL 
50#include <sys/types.h> 49#include <sys/types.h>
51#include <sys/stdarg.h> 50#include <sys/stdarg.h>
52#endif 
53 51
54#include <sys/device_if.h> 52#include <sys/device_if.h>
55 53
56struct clockframe; 54struct clockframe;
57struct lwp; 55struct lwp;
58struct proc; 56struct proc;
59struct timeval; 57struct timeval;
60struct tty; 58struct tty;
61struct uio; 59struct uio;
62struct vnode; 60struct vnode;
63struct vmspace; 61struct vmspace;
64struct vm_map; 62struct vm_map;
65 63