diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/dirfd.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/grantpt.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/unix/dirfd.c b/sysdeps/unix/dirfd.c index 0cdacf9163..536c44e30e 100644 --- a/sysdeps/unix/dirfd.c +++ b/sysdeps/unix/dirfd.c @@ -1,5 +1,5 @@ /* Return the file descriptor used by a DIR stream. Unix version. - Copyright (C) 1995, 1996, 2012 Free Software Foundation, Inc. + Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,9 +22,8 @@ #undef dirfd int -__dirfd (dirp) +dirfd (dirp) DIR *dirp; { return dirp->fd; } -weak_alias(__dirfd, dirfd) diff --git a/sysdeps/unix/sysv/linux/grantpt.c b/sysdeps/unix/sysv/linux/grantpt.c index 06b696b3f7..0a3cd472fa 100644 --- a/sysdeps/unix/sysv/linux/grantpt.c +++ b/sysdeps/unix/sysv/linux/grantpt.c @@ -25,7 +25,7 @@ close_all_fds (void) { char *endp; long int fd = strtol (d->d_name, &endp, 10); - if (*endp == '\0' && fd != PTY_FILENO && fd != __dirfd (dir)) + if (*endp == '\0' && fd != PTY_FILENO && fd != dirfd (dir)) close_not_cancel_no_status (fd); } |