summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-05-24 21:48:07 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-05-24 21:48:07 +0000
commit925272d554e9776675b7908666077d2f3ebe6415 (patch)
tree87ff0995926c98b032c50681e909f72430677607 /sys
parent702c78c15a6f5ae4880c3b18980319ad8a36dd2b (diff)
rename export to export_info for c++ safety. report by naddy@
Diffstat (limited to 'sys')
-rw-r--r--sys/ntfs/ntfs_vfsops.c4
-rw-r--r--sys/sys/mount.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 712d249fe60..25a080594df 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_vfsops.c,v 1.3 2003/05/20 03:36:42 tedu Exp $ */
+/* $OpenBSD: ntfs_vfsops.c,v 1.4 2003/05/24 21:48:05 tedu Exp $ */
/* $NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $ */
/*-
@@ -371,7 +371,7 @@ ntfs_mount (
* will return the vfs_export() error code.
*/
struct ntfsmount *ntm = VFSTONTFS(mp);
- err = vfs_export(mp, &ntm->ntm_export, &args.export);
+ err = vfs_export(mp, &ntm->ntm_export, &args.export_info);
goto success;
}
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 1721e5f81e7..2db5a1ed067 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount.h,v 1.52 2003/05/20 03:05:42 tedu Exp $ */
+/* $OpenBSD: mount.h,v 1.53 2003/05/24 21:48:05 tedu Exp $ */
/* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */
/*
@@ -243,7 +243,7 @@ struct adosfs_args {
struct ntfs_args {
char *fspec; /* block special device to mount */
- struct export_args export; /* network export information */
+ struct export_args export_info;/* network export information */
uid_t uid; /* uid that owns ntfs files */
gid_t gid; /* gid that owns ntfs files */
mode_t mode; /* mask to be applied for ntfs perms */