Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filedesc.h, proc.h: Rename fdopen() to filedescopen() so that it does not 

conflict with the floppy driver.
conf.h: Protect against multiple inclusions. The reason will become apparent
	soon.
systm.h: Bring Debugger() prototype into scope.
This commit is contained in:
christos 1996-03-14 18:59:07 +00:00
parent fb901eb966
commit 84cc73f734
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/sys/conf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.h,v 1.30 1996/02/13 21:08:50 christos Exp $ */
/* $NetBSD: conf.h,v 1.31 1996/03/14 18:59:07 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -40,6 +40,8 @@
* @(#)conf.h 8.3 (Berkeley) 1/21/94
*/
#ifndef _SYS_CONF_H_
#define _SYS_CONF_H_
/*
* Definitions of device driver entry switches
*/
@ -344,3 +346,5 @@ int chrtoblk __P((dev_t));
int iskmemdev __P((dev_t));
int iszerodev __P((dev_t));
#endif
#endif /* _SYS_CONF_ */

3
sys/sys/filedesc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: filedesc.h,v 1.12 1996/02/09 18:25:11 christos Exp $ */
/* $NetBSD: filedesc.h,v 1.13 1996/03/14 18:59:09 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@ -95,7 +95,6 @@ struct filedesc0 {
*/
int dupfdopen __P((struct filedesc *fdp, int indx, int dfd, int mode,
int error));
int fdopen __P((dev_t, int, int, struct proc *));
int fdalloc __P((struct proc *p, int want, int *result));
int fdavail __P((struct proc *p, int n));
int falloc __P((struct proc *p, struct file **resultfp, int *resultfd));

4
sys/sys/proc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: proc.h,v 1.42 1996/02/09 18:25:23 christos Exp $ */
/* $NetBSD: proc.h,v 1.43 1996/03/14 18:59:11 christos Exp $ */
/*-
* Copyright (c) 1986, 1989, 1991, 1993
@ -138,7 +138,7 @@ struct proc {
#define p_startzero p_oppid
pid_t p_oppid; /* Save parent pid during ptrace. XXX */
int p_dupfd; /* Sideways return value from fdopen. XXX */
int p_dupfd; /* Sideways return value from filedescopen. XXX */
/* scheduling */
u_int p_estcpu; /* Time averaged value of p_cpticks. */

4
sys/sys/systm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: systm.h,v 1.42 1996/03/13 21:08:09 christos Exp $ */
/* $NetBSD: systm.h,v 1.43 1996/03/14 18:59:12 christos Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@ -198,8 +198,6 @@ void longjmp __P((label_t *));
#ifdef DDB
/* debugger entry points */
#ifdef notyet /* XXX: Lots of local decls assume int Debugger */
void Debugger __P((void)); /* in DDB only */
#endif
int read_symtab_from_file __P((struct proc *,struct vnode *,const char *));
#endif