Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Define __POOL_EXPOSE almost at the beginning, instead of jus...
details: https://anonhg.NetBSD.org/src/rev/47379c5fd6fa
branches: trunk
changeset: 482594:47379c5fd6fa
user: enami <enami%NetBSD.org@localhost>
date: Wed Feb 16 06:52:31 2000 +0000
description:
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 ...
diffstat:
sbin/ccdconfig/ccdconfig.c | 7 ++++---
usr.sbin/vnconfig/vnconfig.c | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diffs (56 lines):
diff -r d76679a71419 -r 47379c5fd6fa sbin/ccdconfig/ccdconfig.c
--- a/sbin/ccdconfig/ccdconfig.c Wed Feb 16 06:10:15 2000 +0000
+++ b/sbin/ccdconfig/ccdconfig.c Wed Feb 16 06:52:31 2000 +0000
@@ -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 @@
#include <unistd.h>
#include <util.h>
-#define __POOL_EXPOSE
#include <dev/ccdvar.h>
#include "pathnames.h"
diff -r d76679a71419 -r 47379c5fd6fa usr.sbin/vnconfig/vnconfig.c
--- a/usr.sbin/vnconfig/vnconfig.c Wed Feb 16 06:10:15 2000 +0000
+++ b/usr.sbin/vnconfig/vnconfig.c Wed Feb 16 06:52:31 2000 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index