summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2013-08-07 00:00:48 +0000
committermarcel <marcel@FreeBSD.org>2013-08-07 00:00:48 +0000
commit9f2f2e171a6de4c6d713a50366f3572946665fb5 (patch)
treeb8704cff2de99c4cf2da972288c8d1271ec33598 /usr.sbin
parentf5fd32bca5d6cadbe86d031375653c183adce356 (diff)
downloadFreeBSD-src-9f2f2e171a6de4c6d713a50366f3572946665fb5.zip
FreeBSD-src-9f2f2e171a6de4c6d713a50366f3572946665fb5.tar.gz
Change <sys/diskpc98.h> to not redefine the same symbols that are
being defined in <sys/diskmbr.h>. Instead give the symbols here a "PC98_" prefix. This way, both <sys/diskmbr.h> and <sys/diskpc98.h> can be included in the same C source file. The renaming is trivial. The only gotcha is that DOSBBSECTOR is also redefined from 0 to 1. This because DOSBBSECTOR was always used in conjunction with an addition of 1. The PC98_BBSECTOR symbol is defined as 1 and the expression is simplified. Note: it is not believed that ports are seriously impacted; or at all for that matter. Approved by: nyan@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/boot98cfg/boot98cfg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/boot98cfg/boot98cfg.c b/usr.sbin/boot98cfg/boot98cfg.c
index f1ae8329..0ed1b17 100644
--- a/usr.sbin/boot98cfg/boot98cfg.c
+++ b/usr.sbin/boot98cfg/boot98cfg.c
@@ -271,7 +271,7 @@ write_boot(const char *disk, u_char *boot)
warnx("%s: %s", disk, q);
gctl_free(grq);
- for (i = 0; i < NDOSPART; i++) {
+ for (i = 0; i < PC98_NPARTS; i++) {
snprintf(buf, sizeof(buf), "%ss%d", disk, i + 1);
fd = open(buf, O_RDONLY);
if (fd < 0)
OpenPOWER on IntegriCloud