Deleted Added
full compact
user.h (74022) user.h (74914)
1/*
2 * Copyright (c) 1982, 1986, 1989, 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)user.h 8.2 (Berkeley) 9/23/93
1/*
2 * Copyright (c) 1982, 1986, 1989, 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)user.h 8.2 (Berkeley) 9/23/93
34 * $FreeBSD: head/sys/sys/user.h 74022 2001-03-09 11:34:29Z dfr $
34 * $FreeBSD: head/sys/sys/user.h 74914 2001-03-28 09:17:56Z jhb $
35 */
36
37#ifndef _SYS_USER_H_
38#define _SYS_USER_H_
39
40#include <machine/pcb.h>
41#ifndef _KERNEL
42/* stuff that *used* to be included by user.h, or is now needed */
43#include <sys/errno.h>
44#include <sys/time.h>
45#include <sys/resource.h>
46#include <sys/ucred.h>
47#include <sys/uio.h>
35 */
36
37#ifndef _SYS_USER_H_
38#define _SYS_USER_H_
39
40#include <machine/pcb.h>
41#ifndef _KERNEL
42/* stuff that *used* to be included by user.h, or is now needed */
43#include <sys/errno.h>
44#include <sys/time.h>
45#include <sys/resource.h>
46#include <sys/ucred.h>
47#include <sys/uio.h>
48#include <sys/lock.h> /* XXX */
49#include <sys/mutex.h> /* XXX */
48#include <sys/proc.h>
49#include <vm/vm.h> /* XXX */
50#include <vm/vm_param.h> /* XXX */
51#include <vm/pmap.h> /* XXX */
50#include <sys/proc.h>
51#include <vm/vm.h> /* XXX */
52#include <vm/vm_param.h> /* XXX */
53#include <vm/pmap.h> /* XXX */
52#include <sys/lock.h> /* XXX */
53#include <vm/vm_map.h> /* XXX */
54#endif /* !_KERNEL */
55#ifndef _SYS_RESOURCEVAR_H_
56#include <sys/resourcevar.h>
57#endif
58#ifndef _SYS_SIGNALVAR_H_
59#include <sys/signalvar.h>
60#endif

--- 120 unchanged lines hidden ---
54#include <vm/vm_map.h> /* XXX */
55#endif /* !_KERNEL */
56#ifndef _SYS_RESOURCEVAR_H_
57#include <sys/resourcevar.h>
58#endif
59#ifndef _SYS_SIGNALVAR_H_
60#include <sys/signalvar.h>
61#endif

--- 120 unchanged lines hidden ---