diff options
| author | Luca Weiss <luca@z3ntu.xyz> | 2018-06-12 12:57:06 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-06-13 00:30:44 +0200 |
| commit | 06429d67b7e9be332d1012ed4c2bba694e5ddabb (patch) | |
| tree | 38021c5c4d72bd3785ef94724ef57d4d889f7b9a /libnetfs | |
| parent | 4e8acf54512e2b3cf1588fe1d899c65ab27ce641 (diff) | |
| download | hurd-06429d67b7e9be332d1012ed4c2bba694e5ddabb.tar.gz hurd-06429d67b7e9be332d1012ed4c2bba694e5ddabb.tar.bz2 hurd-06429d67b7e9be332d1012ed4c2bba694e5ddabb.zip | |
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 'libnetfs')
| -rw-r--r-- | libnetfs/file-get-translator.c | 4 | ||||
| -rw-r--r-- | libnetfs/file-set-translator.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libnetfs/file-get-translator.c b/libnetfs/file-get-translator.c index 3a54ff10..9a5c425d 100644 --- a/libnetfs/file-get-translator.c +++ b/libnetfs/file-get-translator.c @@ -71,8 +71,8 @@ netfs_S_file_get_translator (struct protid *user, (S_ISCHR (np->nn_stat.st_mode) ? _HURD_CHRDEV : _HURD_BLKDEV), - '\0', major (np->nn_stat.st_rdev), - '\0', minor (np->nn_stat.st_rdev)); + '\0', gnu_dev_major (np->nn_stat.st_rdev), + '\0', gnu_dev_minor (np->nn_stat.st_rdev)); if (buflen < 0) err = ENOMEM; else diff --git a/libnetfs/file-set-translator.c b/libnetfs/file-set-translator.c index 2b71848c..4fc591e8 100644 --- a/libnetfs/file-set-translator.c +++ b/libnetfs/file-set-translator.c @@ -140,7 +140,7 @@ netfs_S_file_set_translator (struct protid *user, minor = strtol (arg, 0, 0); err = netfs_attempt_mkdev (user->user, np, - newmode, makedev (major, minor)); + newmode, gnu_dev_makedev (major, minor)); if (err == EOPNOTSUPP) goto fallback; break; |