Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename structure members to make the code compile in environments 

where "linux" is #defined.
This commit is contained in:
pooka 2012-09-13 13:59:33 +00:00
parent 937cefb281
commit 97fc939fe6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/linux/common/linux_misc.h
View File

@ -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;

10
sys/compat/linux/common/linux_statfs.h
View File

@ -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;
}
}