[src/trunk]: src/sys/arch/sgimips/stand/sgivol Avoid namespace collision when...

[sekiya <sekiya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/95e8704fcac4
branches:  trunk
changeset: 555064:95e8704fcac4
user:      sekiya <sekiya%NetBSD.org@localhost>
date:      Sat Nov 08 04:59:00 2003 +0000

description:
Avoid namespace collision when sgivol is compiled as a native application.

diffstat:

 sys/arch/sgimips/stand/sgivol/sgivol.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r 52a563706920 -r 95e8704fcac4 sys/arch/sgimips/stand/sgivol/sgivol.c
--- a/sys/arch/sgimips/stand/sgivol/sgivol.c    Sat Nov 08 04:49:17 2003 +0000
+++ b/sys/arch/sgimips/stand/sgivol/sgivol.c    Sat Nov 08 04:59:00 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sgivol.c,v 1.7 2003/11/01 06:30:44 sekiya Exp $        */
+/*     $NetBSD: sgivol.c,v 1.8 2003/11/08 04:59:00 sekiya Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,8 +38,8 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <sys/disklabel.h>
-#include <sys/stat.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -59,7 +59,7 @@
 
 #define SGI_SIZE_VOLHDR        3135    /* Can be overridden via -h parameter */
 
-struct devparms {
+struct local_devparms {
        u_int8_t        dp_skew;
        u_int8_t        dp_gap1;
        u_int8_t        dp_gap2;
@@ -85,13 +85,13 @@
        u_int16_t       dp_xwcont;
 }               __attribute__((__packed__));
 
-struct sgilabel {
+struct local_sgilabel {
 #define SGILABEL_MAGIC  0xbe5a941
        u_int32_t       magic;
        int16_t         root;
        int16_t         swap;
        char            bootfile[16];
-       struct devparms dp;
+       struct local_devparms dp;
        struct {
                char            name[8];
                int32_t         block;
@@ -127,7 +127,7 @@
 int    opt_q;                  /* quiet mode */
 int    opt_f;                  /* Don't ask, just do what you're told */
 int    partno, partfirst, partblocks, parttype;
-struct sgilabel *volhdr;
+struct local_sgilabel *volhdr;
 int32_t        checksum;
 u_int32_t      volhdr_size = SGI_SIZE_VOLHDR;
 
@@ -266,7 +266,7 @@
                perror("DIOCGDINFO");
                exit(1);
        }
-       volhdr = (struct sgilabel *) buf;
+       volhdr = (struct local_sgilabel *) buf;
        if (opt_i) {
                init_volhdr();
                exit(0);