Hi, In message <20141103194010.711b...@cvs.netbsd.org> on Mon, 3 Nov 2014 19:40:10 +0000, "SAITOH Masanobu" <msai...@netbsd.org> wrote: > Module Name: src > Committed By: msaitoh > Date: Mon Nov 3 19:40:10 UTC 2014 > > Modified Files: > src/lib/libperfuse [netbsd-6]: ops.c > > Log Message: > Pull up following revision(s) (requested by manu in ticket #1148): > lib/libperfuse/ops.c: revision 1.73 > rmdir dir/.. must return an error. Use ENOTEMPTY like FFS does. > > > To generate a diff of this commit: > cvs rdiff -u -r1.50.2.10 -r1.50.2.11 src/lib/libperfuse/ops.c I need to changes to build successfully.
-- Takahiro Kambe <t...@back-street.net> diff --git a/lib/libperfuse/ops.c b/lib/libperfuse/ops.c index 3541b4f..a3b728c 100644 --- a/lib/libperfuse/ops.c +++ b/lib/libperfuse/ops.c @@ -2884,7 +2884,7 @@ perfuse_node_print(struct puffs_usermount *pu, puffs_cookie_t opc) int perfuse_node_pathconf(struct puffs_usermount *pu, puffs_cookie_t opc, - int name, int *retval) + int name, register_t *retval) { perfuse_msg_t *pm; struct perfuse_state *ps; diff --git a/lib/libperfuse/perfuse_priv.h b/lib/libperfuse/perfuse_priv.h index d32f195..43bbff4 100644 --- a/lib/libperfuse/perfuse_priv.h +++ b/lib/libperfuse/perfuse_priv.h @@ -249,7 +249,7 @@ int perfuse_node_reclaim(struct puffs_usermount *, puffs_cookie_t); int perfuse_node_inactive(struct puffs_usermount *, puffs_cookie_t); int perfuse_node_print(struct puffs_usermount *, puffs_cookie_t); int perfuse_node_pathconf(struct puffs_usermount *, - puffs_cookie_t, int, int *); + puffs_cookie_t, int, register_t *); int perfuse_node_advlock(struct puffs_usermount *, puffs_cookie_t, void *, int, struct flock *, int); int perfuse_node_read(struct puffs_usermount *, puffs_cookie_t,