Author: imp
Date: Mon Feb 3 16:54:53 2014
New Revision: 261438
URL: http://svnweb.freebsd.org/changeset/base/261438
Log:
Move the check for standard keyword + optional inclusion specifier to
its proper location. Otherwise you could have 'file.c standard pci'
without an error. This construct isn't in our tree, and has no well
defined meaning.
Modified:
head/usr.sbin/config/mkmakefile.c
Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c Mon Feb 3 16:47:10 2014
(r261437)
+++ head/usr.sbin/config/mkmakefile.c Mon Feb 3 16:54:53 2014
(r261438)
@@ -513,18 +513,18 @@ nextparam:
nowerror = 1;
goto nextparam;
}
+ if (std) {
+ fprintf(stderr,
+ "standard entry %s has optional inclusion specifier %s!\n",
+ this, wd);
+ exit(1);
+ }
nreqs++;
STAILQ_FOREACH(dp, &dtab, d_next)
if (eq(dp->d_name, wd)) {
dp->d_done |= DEVDONE;
goto nextparam;
}
- if (std) {
- fprintf(stderr,
- "standard entry %s has a device keyword - %s!\n",
- this, wd);
- exit(1);
- }
SLIST_FOREACH(op, &opt, op_next)
if (op->op_value == 0 && opteq(op->op_name, wd))
goto nextparam;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
