From 06429d67b7e9be332d1012ed4c2bba694e5ddabb Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Tue, 12 Jun 2018 12:57:06 +0200 Subject: 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 . * term/users.c: Include --- libfshelp/fetch-root.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libfshelp/fetch-root.c') 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; -- cgit v1.2.3