Back out previous, it caused compile errors in kern_fork.c. ISSET
and friends should either be made first-class citizens and moved to an include file (systm.h perhaps), or nuked completely, but not be redefined in a lot of files.
This commit is contained in:
parent
2e98091daf
commit
d0e6437e6d
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kern_systrace.c,v 1.20 2002/11/10 10:01:04 jdolecek Exp $ */
|
||||
/* $NetBSD: kern_systrace.c,v 1.21 2002/11/10 14:02:13 fvdl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
|
||||
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_systrace.c,v 1.20 2002/11/10 10:01:04 jdolecek Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_systrace.c,v 1.21 2002/11/10 14:02:13 fvdl Exp $");
|
||||
|
||||
#include "opt_systrace.h"
|
||||
|
||||
|
@ -207,14 +207,6 @@ const struct cdevsw systrace_cdevsw = {
|
|||
|
||||
#define DPRINTF(y) if (systrace_debug) printf y;
|
||||
|
||||
#ifndef ISSET
|
||||
|
||||
#define SET(t, f) ((t) |= (f))
|
||||
#define ISSET(t, f) ((t) & (f))
|
||||
#define CLR(t, f) ((t) &= ~(f))
|
||||
|
||||
#endif /* !ISSET */
|
||||
|
||||
/* ARGSUSED */
|
||||
int
|
||||
systracef_read(struct file *fp, off_t *poff, struct uio *uio,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: systrace.h,v 1.7 2002/11/10 10:01:03 jdolecek Exp $ */
|
||||
/* $NetBSD: systrace.h,v 1.8 2002/11/10 14:01:57 fvdl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
|
||||
|
@ -160,6 +160,11 @@ struct systrace_replace {
|
|||
#define SYSTR_FLAGS_SETEGID 0x004
|
||||
|
||||
#ifdef _KERNEL
|
||||
/* XXX: these shouldn't be here. */
|
||||
#define SET(t, f) ((t) |= (f))
|
||||
#define ISSET(t, f) ((t) & (f))
|
||||
#define CLR(t, f) ((t) &= ~(f))
|
||||
|
||||
struct str_process;
|
||||
struct fsystrace {
|
||||
struct lock lock;
|
||||
|
|
Loading…
Reference in New Issue