summaryrefslogtreecommitdiff
path: root/sys/compat/linux
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2012-09-13 13:59:33 +0000
committerpooka <pooka@NetBSD.org>2012-09-13 13:59:33 +0000
commite01c2439d9d20856128a79e77fa6d032aeebe72a (patch)
tree8fdff929d011a20d4973c7e06fb043c4fb8a622c /sys/compat/linux
parentcef7e67a70b644c35be792195b239ddf8b6a8a86 (diff)
Rename structure members to make the code compile in environments
where "linux" is #defined.
Diffstat (limited to 'sys/compat/linux')
-rw-r--r--sys/compat/linux/common/linux_misc.h6
-rw-r--r--sys/compat/linux/common/linux_statfs.h10
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/compat/linux/common/linux_misc.h b/sys/compat/linux/common/linux_misc.h
index 27c363d0284..3ed0a937689 100644
--- a/sys/compat/linux/common/linux_misc.h
+++ b/sys/compat/linux/common/linux_misc.h
@@ -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 @@ struct linux_sysinfo {
#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 --git a/sys/compat/linux/common/linux_statfs.h b/sys/compat/linux/common/linux_statfs.h
index 1debfe54084..ea66542366f 100644
--- a/sys/compat/linux/common/linux_statfs.h
+++ b/sys/compat/linux/common/linux_statfs.h
@@ -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 @@ bsd_to_linux_statfs(const struct statvfs *bsp, struct linux_statfs *lsp)
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 @@ bsd_to_linux_statfs64(const struct statvfs *bsp, struct linux_statfs64 *lsp)
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;
}
}