CVS commit: src/sys/compat/linux/common

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Thu Sep 13 13:59:33 UTC 2012

Modified Files:
        src/sys/compat/linux/common: linux_misc.h linux_statfs.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/linux/common/linux_misc.h
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/linux/common/linux_statfs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.21 src/sys/compat/linux/common/linux_misc.h:1.22
--- src/sys/compat/linux/common/linux_misc.h:1.21	Mon May 30 17:50:32 2011
+++ src/sys/compat/linux/common/linux_misc.h	Thu Sep 13 13:59:33 2012
@@ -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;

Index: src/sys/compat/linux/common/linux_statfs.h
diff -u src/sys/compat/linux/common/linux_statfs.h:1.5 src/sys/compat/linux/common/linux_statfs.h:1.6
--- src/sys/compat/linux/common/linux_statfs.h:1.5	Tue Nov  2 18:14:05 2010
+++ src/sys/compat/linux/common/linux_statfs.h	Thu Sep 13 13:59:33 2012
@@ -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
 	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 statv
 	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;
 		}
 	}