diff options
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/device-nrs.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/pathconf.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ptsname.c | 20 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ttyname.h | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/device-nrs.h b/sysdeps/unix/sysv/linux/device-nrs.h index 8d5558d3dc..6fd7ad0150 100644 --- a/sysdeps/unix/sysv/linux/device-nrs.h +++ b/sysdeps/unix/sysv/linux/device-nrs.h @@ -39,7 +39,7 @@ /* Test whether given device is a tty. */ #define DEV_TTY_P(statp) \ - ({ int __dev_major = major ((statp)->st_rdev); \ + ({ int __dev_major = __gnu_dev_major ((statp)->st_rdev); \ __dev_major >= DEV_TTY_LOW_MAJOR && __dev_major <= DEV_TTY_HIGH_MAJOR; }) #endif /* device-nrs.h */ diff --git a/sysdeps/unix/sysv/linux/pathconf.c b/sysdeps/unix/sysv/linux/pathconf.c index 3b8f48087a..59a50cea43 100644 --- a/sysdeps/unix/sysv/linux/pathconf.c +++ b/sysdeps/unix/sysv/linux/pathconf.c @@ -73,7 +73,7 @@ distinguish_extX (const struct statfs *fsbuf, const char *file, int fd) return EXT2_LINK_MAX; __snprintf (buf, sizeof (buf), "/sys/dev/block/%u:%u", - gnu_dev_major (st.st_dev), gnu_dev_minor (st.st_dev)); + __gnu_dev_major (st.st_dev), __gnu_dev_minor (st.st_dev)); ssize_t n = __readlink (buf, path, sizeof (path)); if (n != -1 && n < sizeof (path)) diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c index 6798dfb4c4..a4c233680f 100644 --- a/sysdeps/unix/sysv/linux/ptsname.c +++ b/sysdeps/unix/sysv/linux/ptsname.c @@ -29,16 +29,18 @@ #include <_itoa.h> /* Check if DEV corresponds to a master pseudo terminal device. */ -#define MASTER_P(Dev) \ - (major ((Dev)) == 2 \ - || (major ((Dev)) == 4 && minor ((Dev)) >= 128 && minor ((Dev)) < 192) \ - || (major ((Dev)) >= 128 && major ((Dev)) < 136)) +#define MASTER_P(Dev) \ + (__gnu_dev_major ((Dev)) == 2 \ + || (__gnu_dev_major ((Dev)) == 4 \ + && __gnu_dev_minor ((Dev)) >= 128 && __gnu_dev_minor ((Dev)) < 192) \ + || (__gnu_dev_major ((Dev)) >= 128 && __gnu_dev_major ((Dev)) < 136)) /* Check if DEV corresponds to a slave pseudo terminal device. */ -#define SLAVE_P(Dev) \ - (major ((Dev)) == 3 \ - || (major ((Dev)) == 4 && minor ((Dev)) >= 192 && minor ((Dev)) < 256) \ - || (major ((Dev)) >= 136 && major ((Dev)) < 144)) +#define SLAVE_P(Dev) \ + (__gnu_dev_major ((Dev)) == 3 \ + || (__gnu_dev_major ((Dev)) == 4 \ + && __gnu_dev_minor ((Dev)) >= 192 && __gnu_dev_minor ((Dev)) < 256) \ + || (__gnu_dev_major ((Dev)) >= 136 && __gnu_dev_major ((Dev)) < 144)) /* Note that major number 4 corresponds to the old BSD style pseudo terminal devices. As of Linux 2.1.115 these are no longer @@ -122,7 +124,7 @@ __ptsname_internal (int fd, char *buf, size_t buflen, struct stat64 *stp) return ENOTTY; } - ptyno = minor (stp->st_rdev); + ptyno = __gnu_dev_minor (stp->st_rdev); if (ptyno / 16 >= strlen (__libc_ptyname1)) { diff --git a/sysdeps/unix/sysv/linux/ttyname.h b/sysdeps/unix/sysv/linux/ttyname.h index 74332d28af..8ef0a16101 100644 --- a/sysdeps/unix/sysv/linux/ttyname.h +++ b/sysdeps/unix/sysv/linux/ttyname.h @@ -28,7 +28,7 @@ static inline bool is_pty (struct stat64 *sb) { #ifdef _STATBUF_ST_RDEV - int m = major (sb->st_rdev); + int m = __gnu_dev_major (sb->st_rdev); return (136 <= m && m <= 143); #else return false; |