aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-03-14 16:50:33 +0100
committerAndreas Jaeger <aj@suse.de>2012-03-14 17:09:07 +0100
commit1e2405c8fa877d7cb3c06626c94356faaa7bd1e0 (patch)
treeefdf1794308e9efe0627fbc89a99fa6d0a4750dd /sysdeps/unix
parent356a10ee3ee36bec0af7e8a1c61e353e0af45904 (diff)
downloadglibc-1e2405c8fa877d7cb3c06626c94356faaa7bd1e0.zip
glibc-1e2405c8fa877d7cb3c06626c94356faaa7bd1e0.tar.gz
glibc-1e2405c8fa877d7cb3c06626c94356faaa7bd1e0.tar.bz2
Remove files so that i386 uses the iee754/dbl-64 sin and cos implementation.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/dirfd.c5
-rw-r--r--sysdeps/unix/sysv/linux/grantpt.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/unix/dirfd.c b/sysdeps/unix/dirfd.c
index 0cdacf9..536c44e 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 06b696b..0a3cd47 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);
}