diff options
| author | Doug Rabson <dfr@FreeBSD.org> | 1998-08-24 08:45:37 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@FreeBSD.org> | 1998-08-24 08:45:37 +0000 |
| commit | dfb80032972bcb689a36cd657538dfa251a9942c (patch) | |
| tree | 5d84c31f713315b76a289e31cb98f89c0f2fe5c4 /sys/sys/diskpc98.h | |
| parent | 069e9bc1b4e6189140c16ee2d7277dc0301b3f71 (diff) | |
| download | src-dfb80032972bcb689a36cd657538dfa251a9942c.tar.gz src-dfb80032972bcb689a36cd657538dfa251a9942c.zip | |
Remove a useless ifdef which made struct disklabel have a different
size in kernel and user builds on the alpha and prevented various ioctls
from working.
Notes
Notes:
svn path=/head/; revision=38518
Diffstat (limited to 'sys/sys/diskpc98.h')
| -rw-r--r-- | sys/sys/diskpc98.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h index 859a3c76c74e..dcdbeaa2a40b 100644 --- a/sys/sys/diskpc98.h +++ b/sys/sys/diskpc98.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 - * $Id: disklabel.h,v 1.33 1998/07/07 04:19:25 bde Exp $ + * $Id: disklabel.h,v 1.34 1998/07/12 16:48:08 dfr Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -98,9 +98,6 @@ struct disklabel { * as found in /usr/mdec. These are returned when using * getdiskbyname(3) to retrieve the values from /etc/disktab. */ -#if defined(KERNEL) || defined(STANDALONE) - char d_packname[16]; /* pack identifier */ -#else union { char un_d_packname[16]; /* pack identifier */ struct { @@ -111,7 +108,6 @@ struct disklabel { #define d_packname d_un.un_d_packname #define d_boot0 d_un.un_b.un_d_boot0 #define d_boot1 d_un.un_b.un_d_boot1 -#endif /* ! KERNEL or STANDALONE */ /* disk geometry: */ u_int32_t d_secsize; /* # of bytes per sector */ |