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

Remove a useless ifdef which made struct disklabel have a different

Browse Source 
size in kernel and user builds on the alpha and prevented various ioctls
from working.
This commit is contained in:
dfr 1998-08-24 08:45:37 +00:00
parent 5fdaeb281d
commit 468880bba6
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/sys/disklabel.h
View File

@ -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 */

6
sys/sys/diskmbr.h
View File

@ -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 */

6
sys/sys/diskpc98.h
View File

@ -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 */