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 /storeio | |
| parent | 4e8acf54512e2b3cf1588fe1d899c65ab27ce641 (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 'storeio')
| -rw-r--r-- | storeio/storeio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storeio/storeio.c b/storeio/storeio.c index 515944ed..96ea6823 100644 --- a/storeio/storeio.c +++ b/storeio/storeio.c @@ -83,7 +83,7 @@ parse_opt (int key, char *arg, struct argp_state *state) /* MAJOR,MINOR form */ { start = end + 1; - rdev = makedev (rdev, strtoul (start, &end, 0)); + rdev = gnu_dev_makedev (rdev, strtoul (start, &end, 0)); } if (end == start || *end != '\0') @@ -164,7 +164,7 @@ trivfs_append_args (struct trivfs_control *trivfs_control, { char buf[40]; snprintf (buf, sizeof buf, "--rdev=%d,%d", - major (dev->rdev), minor (dev->rdev)); + gnu_dev_major (dev->rdev), gnu_dev_minor (dev->rdev)); err = argz_add (argz, argz_len, buf); } |