summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcube <cube@NetBSD.org>2009-03-13 20:44:59 +0000
committercube <cube@NetBSD.org>2009-03-13 20:44:59 +0000
commit1894a7d27bc4d74520befd192d33fe33f3feebbf (patch)
treee5197bec45f2229161a749ddf2b281d506b7e43c
parentc27d58c8b1d505339d3640b47f9f9cb85cf021ed (diff)
Now that condmkopttab isn't a hash table anymore, don't initialise it with
ht_new()... So actually rename it to condmkoptions to avoid confusion. Reported build failure on amd64 (strange that I wouldn't get it on i386) on current-users by Kurt Schreiner.
-rw-r--r--usr.bin/config/defs.h4
-rw-r--r--usr.bin/config/main.c5
-rw-r--r--usr.bin/config/mkmakefile.c4
3 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/config/defs.h b/usr.bin/config/defs.h
index 9356c5c2898..57b5a8fbf87 100644
--- a/usr.bin/config/defs.h
+++ b/usr.bin/config/defs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.29 2009/03/13 18:24:41 cube Exp $ */
+/* $NetBSD: defs.h,v 1.30 2009/03/13 20:44:59 cube Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -402,7 +402,7 @@ struct nvlist *options; /* options */
struct nvlist *fsoptions; /* filesystems */
struct nvlist *mkoptions; /* makeoptions */
struct nvlist *appmkoptions; /* appending mkoptions */
-struct nvlist *condmkopttab; /* conditional makeoption table */
+struct nvlist *condmkoptions; /* conditional makeoption table */
struct hashtab *devbasetab; /* devbase lookup */
struct hashtab *devroottab; /* attach at root lookup */
struct hashtab *devatab; /* devbase attachment lookup */
diff --git a/usr.bin/config/main.c b/usr.bin/config/main.c
index 216398ce1c2..569c650b926 100644
--- a/usr.bin/config/main.c
+++ b/usr.bin/config/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.35 2009/03/13 18:24:41 cube Exp $ */
+/* $NetBSD: main.c,v 1.36 2009/03/13 20:44:59 cube Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -264,7 +264,6 @@ main(int argc, char **argv)
needcnttab = ht_new();
opttab = ht_new();
mkopttab = ht_new();
- condmkopttab = ht_new();
fsopttab = ht_new();
deffstab = ht_new();
defopttab = ht_new();
@@ -280,7 +279,7 @@ main(int argc, char **argv)
nextopt = &options;
nextmkopt = &mkoptions;
nextappmkopt = &appmkoptions;
- nextcndmkopt = &condmkopttab;
+ nextcndmkopt = &condmkoptions;
nextfsopt = &fsoptions;
/*
diff --git a/usr.bin/config/mkmakefile.c b/usr.bin/config/mkmakefile.c
index 2cfc0e5b3c6..7bf9e2e964f 100644
--- a/usr.bin/config/mkmakefile.c
+++ b/usr.bin/config/mkmakefile.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.11 2009/03/13 18:24:41 cube Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.12 2009/03/13 20:44:59 cube Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -555,7 +555,7 @@ emitappmkoptions(FILE *fp)
for (nv = appmkoptions; nv != NULL; nv = nv->nv_next)
fprintf(fp, "%s+=%s\n", nv->nv_name, nv->nv_str);
- for (nv = condmkopttab; nv != NULL; nv = nv->nv_next)
+ for (nv = condmkoptions; nv != NULL; nv = nv->nv_next)
{
if (expr_eval(nv->nv_ptr, selectopt, NULL))
fprintf(fp, "%s+=%s\n", nv->nv_name, nv->nv_str);