summaryrefslogtreecommitdiff
path: root/libfshelp
diff options
context:
space:
mode:
authorLuca Weiss <luca@z3ntu.xyz>2018-06-12 12:57:06 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-06-13 00:30:44 +0200
commit06429d67b7e9be332d1012ed4c2bba694e5ddabb (patch)
tree38021c5c4d72bd3785ef94724ef57d4d889f7b9a /libfshelp
parent4e8acf54512e2b3cf1588fe1d899c65ab27ce641 (diff)
Hurd patches (fix compilation)
* isofs/rr.c (rrip_work): Use gnu_dev_makedev instead of makedev. * libdiskfs/file-set-trans.c (diskfs_S_file_set_translator): Likewise. * libnetfs/file-set-translator.c (netfs_S_file_set_translator): Likeiwse. * nfs/nfs.c (xdr_decode_fattr): Likewise. * storeio/storeio.c (parse_opt): Likewise. * libfshelp/fetch-root.c (fshelp_short_circuited_callback1): Use gnu_dev_major and gnu_dev_minor instead of major and minor. * libnetfs/file-get-translator.c (netfs_S_file_get_translator): Likewise. * nfs/ops.c (netfs_attempt_link): Likewise. * storeio/storeio.c (trivfs_append_args): Likewise. * trans/fakeroot.c (netfs_attempt_mkdev): Likewise. * pfinet/glue-include/linux/mm.h: Include <mach/vm_param.h>. * term/users.c: Include <signal.h>
Diffstat (limited to 'libfshelp')
-rw-r--r--libfshelp/fetch-root.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libfshelp/fetch-root.c b/libfshelp/fetch-root.c
index 0248f11d..082308da 100644
--- a/libfshelp/fetch-root.c
+++ b/libfshelp/fetch-root.c
@@ -216,8 +216,8 @@ fshelp_short_circuited_callback1 (void *cookie1, void *cookie2,
if (asprintf (argz, "%s%c%d%c%d",
(S_ISCHR (*statc->modep)
? _HURD_CHRDEV : _HURD_BLKDEV),
- 0, major (statc->statp->st_rdev),
- 0, minor (statc->statp->st_rdev)) < 0)
+ 0, gnu_dev_major (statc->statp->st_rdev),
+ 0, gnu_dev_minor (statc->statp->st_rdev)) < 0)
return ENOMEM;
*argz_len = strlen (*argz) + 1;
*argz_len += strlen (*argz + *argz_len) + 1;