Module Name: src
Committed By: pooka
Date: Mon Mar 22 14:40:54 UTC 2010
Modified Files:
src/usr.bin/config: defs.h main.c mkheaders.c
Log Message:
Some drivers want to include ioconf.h, so generate it if doing
"ioconf" config.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/config/defs.h
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/config/main.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/config/mkheaders.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.33 src/usr.bin/config/defs.h:1.34
--- src/usr.bin/config/defs.h:1.33 Mon Mar 8 10:19:14 2010
+++ src/usr.bin/config/defs.h Mon Mar 22 14:40:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.33 2010/03/08 10:19:14 pooka Exp $ */
+/* $NetBSD: defs.h,v 1.34 2010/03/22 14:40:54 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -526,6 +526,7 @@
int mkheaders(void);
int moveifchanged(const char *, const char *);
int emitlocs(void);
+int emitioconfh(void);
/* mkioconf.c */
int mkioconf(void);
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.41 src/usr.bin/config/main.c:1.42
--- src/usr.bin/config/main.c:1.41 Mon Mar 8 10:19:14 2010
+++ src/usr.bin/config/main.c Mon Mar 22 14:40:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.41 2010/03/08 10:19:14 pooka Exp $ */
+/* $NetBSD: main.c,v 1.42 2010/03/22 14:40:54 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -388,6 +388,7 @@
pack();
mkioconf();
emitlocs();
+ emitioconfh();
return 0;
}
Index: src/usr.bin/config/mkheaders.c
diff -u src/usr.bin/config/mkheaders.c:1.17 src/usr.bin/config/mkheaders.c:1.18
--- src/usr.bin/config/mkheaders.c:1.17 Wed Feb 3 21:00:49 2010
+++ src/usr.bin/config/mkheaders.c Mon Mar 22 14:40:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mkheaders.c,v 1.17 2010/02/03 21:00:49 pooka Exp $ */
+/* $NetBSD: mkheaders.c,v 1.18 2010/03/22 14:40:54 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -59,7 +59,6 @@
static int emitcnt(struct nvlist *);
static int emitopts(void);
-static int emitioconfh(void);
static int emittime(void);
static int herr(const char *, const char *, FILE *);
static int defopts_print(const char *, void *, void *);
@@ -376,7 +375,7 @@
* Build the "ioconf.h" file with extern declarations for all configured
* cfdrivers.
*/
-static int
+int
emitioconfh(void)
{
const char *tfname;
