Module Name: src
Committed By: msaitoh
Date: Tue Nov 4 01:50:42 UTC 2014
Modified Files:
src/lib/libperfuse [netbsd-6]: ops.c perfuse_priv.h
Log Message:
Pull up following revision(s) (requested by manu in ticket #1153):
lib/libperfuse/ops.c 1.72
lib/libperfuse/perfuse_priv.h 1.35
Fix build failure on amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.50.2.11 -r1.50.2.12 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.25.2.5 -r1.25.2.6 src/lib/libperfuse/perfuse_priv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.50.2.11 src/lib/libperfuse/ops.c:1.50.2.12
--- src/lib/libperfuse/ops.c:1.50.2.11 Mon Nov 3 19:40:10 2014
+++ src/lib/libperfuse/ops.c Tue Nov 4 01:50:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.50.2.11 2014/11/03 19:40:10 msaitoh Exp $ */
+/* $NetBSD: ops.c,v 1.50.2.12 2014/11/04 01:50:42 msaitoh Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -2884,7 +2884,7 @@ perfuse_node_print(struct puffs_usermoun
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;
Index: src/lib/libperfuse/perfuse_priv.h
diff -u src/lib/libperfuse/perfuse_priv.h:1.25.2.5 src/lib/libperfuse/perfuse_priv.h:1.25.2.6
--- src/lib/libperfuse/perfuse_priv.h:1.25.2.5 Mon Nov 3 19:18:09 2014
+++ src/lib/libperfuse/perfuse_priv.h Tue Nov 4 01:50:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse_priv.h,v 1.25.2.5 2014/11/03 19:18:09 msaitoh Exp $ */
+/* $NetBSD: perfuse_priv.h,v 1.25.2.6 2014/11/04 01:50:42 msaitoh Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -249,7 +249,7 @@ int perfuse_node_reclaim(struct puffs_us
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,
