hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-01 00:18:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Workaround for conflicting kernel prototypes in user mode breaking make world

Browse Source 
I've moved the #include <machine/conf.h> inside the #ifdef KERNEL
becuause things like modload #include <sys/conf.h> for the cdevsw definitions
but dont need the conflicting prototype for fdopen in stdio.h and
machine/conf.h.

Bruce may have a better fix for this, but for now I need a make world..
This commit is contained in:
Peter Wemm 1995-11-05 09:37:28 +00:00
parent dbc57b8da7
commit c6b45cc039
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/sys/conf.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.3 (Berkeley) 1/21/94
* $Id: conf.h,v 1.18 1995/10/04 03:43:18 julian Exp $
* $Id: conf.h,v 1.19 1995/11/04 13:25:32 bde Exp $
*/
#ifndef _SYS_CONF_H_
@ -163,9 +163,9 @@ int unregister_cdev __P((const char *name, const struct cdevsw *cdp));
#ifdef JREMOD
int cdevsw_add __P((dev_t *descrip,struct cdevsw *new,struct cdevsw *old));
int bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw *old));
#endif
#endif
#endif /* JREMOD */
#include <machine/conf.h>
#endif /* KERNEL */
#endif /* !_SYS_CONF_H_ */

6
sys/sys/linedisc.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.3 (Berkeley) 1/21/94
* $Id: conf.h,v 1.18 1995/10/04 03:43:18 julian Exp $
* $Id: conf.h,v 1.19 1995/11/04 13:25:32 bde Exp $
*/
#ifndef _SYS_CONF_H_
@ -163,9 +163,9 @@ int unregister_cdev __P((const char *name, const struct cdevsw *cdp));
#ifdef JREMOD
int cdevsw_add __P((dev_t *descrip,struct cdevsw *new,struct cdevsw *old));
int bdevsw_add __P((dev_t *descrip,struct bdevsw *new,struct bdevsw *old));
#endif
#endif
#endif /* JREMOD */
#include <machine/conf.h>
#endif /* KERNEL */
#endif /* !_SYS_CONF_H_ */