d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary use of the __ia64__ conditional. This slightly improves

Browse Source 
maintainability and generally avoids confusion.
This commit is contained in:
Marcel Moolenaar 2004-08-01 22:44:40 +00:00
parent 8ea534a9c0
commit 1903a591c9
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/sade/disks.c
View File

@ -396,7 +396,7 @@ diskPartition(Device *dev)
case 'A':
case 'F': /* Undocumented magic Dangerously Dedicated mode */
#if !defined(__i386__) && !defined(__amd64__) && !defined(__ia64__)
#if !defined(__i386__) && !defined(__amd64__)
rv = 1;
#else /* The rest is only relevant on x86 */
cp = variable_get(VAR_DEDICATE_DISK);
@ -624,8 +624,7 @@ diskPartition(Device *dev)
}
clear();
break;
#ifndef __ia64__
case '|':
if (!msgNoYes("Are you SURE you want to go into Wizard mode?\n"
"No seat belts whatsoever are provided!")) {
@ -639,7 +638,6 @@ diskPartition(Device *dev)
msg = "Wise choice!";
clear();
break;
#endif
case '\033': /* ESC */
case 'Q':
@ -856,7 +854,7 @@ diskPartitionWrite(dialogMenuItem *self)
for (i = 0; devs[i]; i++) {
Disk *d = (Disk *)devs[i]->private;
static u_char *boot1;
#if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
#if defined(__i386__) || defined(__amd64__)
static u_char *boot2;
#endif

8
usr.sbin/sysinstall/disks.c
View File

@ -396,7 +396,7 @@ diskPartition(Device *dev)
case 'A':
case 'F': /* Undocumented magic Dangerously Dedicated mode */
#if !defined(__i386__) && !defined(__amd64__) && !defined(__ia64__)
#if !defined(__i386__) && !defined(__amd64__)
rv = 1;
#else /* The rest is only relevant on x86 */
cp = variable_get(VAR_DEDICATE_DISK);
@ -624,8 +624,7 @@ diskPartition(Device *dev)
}
clear();
break;
#ifndef __ia64__
case '|':
if (!msgNoYes("Are you SURE you want to go into Wizard mode?\n"
"No seat belts whatsoever are provided!")) {
@ -639,7 +638,6 @@ diskPartition(Device *dev)
msg = "Wise choice!";
clear();
break;
#endif
case '\033': /* ESC */
case 'Q':
@ -856,7 +854,7 @@ diskPartitionWrite(dialogMenuItem *self)
for (i = 0; devs[i]; i++) {
Disk *d = (Disk *)devs[i]->private;
static u_char *boot1;
#if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
#if defined(__i386__) || defined(__amd64__)
static u_char *boot2;
#endif