[src/trunk]: src/sys/compat/linux/common Rename structure members to make the...

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

details:   https://anonhg.NetBSD.org/src/rev/d93cb17c0c8d
branches:  trunk
changeset: 781538:d93cb17c0c8d
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Sep 13 13:59:33 2012 +0000

description:
Rename structure members to make the code compile in environments
where "linux" is #defined.

diffstat:

 sys/compat/linux/common/linux_misc.h   |   6 +++---
 sys/compat/linux/common/linux_statfs.h |  10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r ecf22a5431bd -r d93cb17c0c8d sys/compat/linux/common/linux_misc.h
--- a/sys/compat/linux/common/linux_misc.h      Thu Sep 13 12:16:47 2012 +0000
+++ b/sys/compat/linux/common/linux_misc.h      Thu Sep 13 13:59:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_misc.h,v 1.21 2011/05/30 17:50:32 alnsn Exp $    */
+/*     $NetBSD: linux_misc.h,v 1.22 2012/09/13 13:59:33 pooka Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -116,8 +116,8 @@
 #define        LINUX_XENIX_SUPER_MAGIC         (LINUX_SYSV_MAGIC_BASE + 1)
 
 struct linux_mnttypes {
-       const char *bsd;
-       int linux;
+       const char *mty_bsd;
+       int mty_linux;
 };
 extern const struct linux_mnttypes linux_fstypes[];
 extern const int linux_fstypes_cnt;
diff -r ecf22a5431bd -r d93cb17c0c8d sys/compat/linux/common/linux_statfs.h
--- a/sys/compat/linux/common/linux_statfs.h    Thu Sep 13 12:16:47 2012 +0000
+++ b/sys/compat/linux/common/linux_statfs.h    Thu Sep 13 13:59:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_statfs.h,v 1.5 2010/11/02 18:14:05 chs Exp $     */
+/*     $NetBSD: linux_statfs.h,v 1.6 2012/09/13 13:59:33 pooka Exp $   */
 
 /*-
  * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -49,8 +49,8 @@
        int i;
 
        for (i = 0; i < linux_fstypes_cnt; i++) {
-               if (strcmp(bsp->f_fstypename, linux_fstypes[i].bsd) == 0) {
-                       lsp->l_ftype = linux_fstypes[i].linux;
+               if (strcmp(bsp->f_fstypename, linux_fstypes[i].mty_bsd) == 0) {
+                       lsp->l_ftype = linux_fstypes[i].mty_linux;
                        break;
                }
        }
@@ -97,8 +97,8 @@
        int i, div;
 
        for (i = 0; i < linux_fstypes_cnt; i++) {
-               if (strcmp(bsp->f_fstypename, linux_fstypes[i].bsd) == 0) {
-                       lsp->l_ftype = linux_fstypes[i].linux;
+               if (strcmp(bsp->f_fstypename, linux_fstypes[i].mty_bsd) == 0) {
+                       lsp->l_ftype = linux_fstypes[i].mty_linux;
                        break;
                }
        }