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

Define __POOL_EXPOSE almost at the beginning, instead of just before 

dev/vndvar.h or dev/ccdvar.h so that struct pool is always available
regardless of multiple inclusion.  Actually, ccdconfig.c compiles without
this change but ...
This commit is contained in:
enami 2000-02-16 06:52:31 +00:00
parent 7414be8dd0
commit 24d448f70e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/ccdconfig/ccdconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ccdconfig.c,v 1.28 1999/08/11 02:44:35 thorpej Exp $ */
/* $NetBSD: ccdconfig.c,v 1.29 2000/02/16 06:52:32 enami Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -41,9 +41,11 @@
__COPYRIGHT(
"@(#) Copyright (c) 1996, 1997\
The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: ccdconfig.c,v 1.28 1999/08/11 02:44:35 thorpej Exp $");
__RCSID("$NetBSD: ccdconfig.c,v 1.29 2000/02/16 06:52:32 enami Exp $");
#endif
#define __POOL_EXPOSE /* dev/ccdvar.h uses struct pool */
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>
@ -64,7 +66,6 @@ __RCSID("$NetBSD: ccdconfig.c,v 1.28 1999/08/11 02:44:35 thorpej Exp $");
#include <unistd.h>
#include <util.h>
#define __POOL_EXPOSE
#include <dev/ccdvar.h>
#include "pathnames.h"

5
usr.sbin/vnconfig/vnconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vnconfig.c,v 1.17 1999/04/01 17:24:03 veego Exp $ */
/* $NetBSD: vnconfig.c,v 1.18 2000/02/16 06:52:31 enami Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -78,6 +78,8 @@
* @(#)vnconfig.c 8.1 (Berkeley) 12/15/93
*/
#define __POOL_EXPOSE /* dev/vndvar.h uses struct pool */
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/mount.h>
@ -86,7 +88,6 @@
#include <sys/disklabel.h>
#include <sys/disk.h>
#define __POOL_EXPOSE
#include <dev/vndvar.h>
#include <disktab.h>