diff options
author | Roland McGrath <roland@gnu.org> | 2005-10-16 08:34:04 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2005-10-16 08:34:04 +0000 |
commit | 4b2faf49ce99f8bb1efd34e15022bda59ebbf67d (patch) | |
tree | 0f7c0742b8aa7fc0bd1cdf55d9df2e7b5405ccd4 | |
parent | 9b0c3f38d3850dad8f99f93c5d108a628e015ef1 (diff) | |
download | glibc-4b2faf49ce99f8bb1efd34e15022bda59ebbf67d.tar glibc-4b2faf49ce99f8bb1efd34e15022bda59ebbf67d.tar.gz glibc-4b2faf49ce99f8bb1efd34e15022bda59ebbf67d.tar.bz2 glibc-4b2faf49ce99f8bb1efd34e15022bda59ebbf67d.zip |
2005-10-15 Thomas Schwinge <tschwinge@gnu.org>
* include/dirent.h: Include <stdbool.h>.
* sysdeps/mach/hurd/fdopendir.c: Include <fcntl.h>.
(fdopendir): Correct argument to _hurd_fd_get().
* sysdeps/mach/hurd/opendir.c (__opendir): Remove stray `}'.
-rw-r--r-- | include/dirent.h | 1 | ||||
-rw-r--r-- | sysdeps/mach/hurd/fdopendir.c | 3 | ||||
-rw-r--r-- | sysdeps/mach/hurd/opendir.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/dirent.h b/include/dirent.h index 81ad24d9dd..4e95ffd6cd 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -2,6 +2,7 @@ # include <dirstream.h> # include <dirent/dirent.h> # include <sys/stat.h> +# include <stdbool.h> /* Now define the internal interfaces. */ extern DIR *__opendir (__const char *__name); diff --git a/sysdeps/mach/hurd/fdopendir.c b/sysdeps/mach/hurd/fdopendir.c index d08e478c61..37dd4bc82e 100644 --- a/sysdeps/mach/hurd/fdopendir.c +++ b/sysdeps/mach/hurd/fdopendir.c @@ -21,6 +21,7 @@ #include <errno.h> #include <hurd.h> #include <hurd/fd.h> +#include <fcntl.h> DIR *_hurd_fd_opendir (struct hurd_fd *d); /* opendir.c */ @@ -28,7 +29,7 @@ DIR *_hurd_fd_opendir (struct hurd_fd *d); /* opendir.c */ DIR * fdopendir (int fd) { - struct hurd_fd *d = _hurd_fd_get (d); + struct hurd_fd *d = _hurd_fd_get (fd); if (d == NULL) { diff --git a/sysdeps/mach/hurd/opendir.c b/sysdeps/mach/hurd/opendir.c index 949db0fff5..5b10142d39 100644 --- a/sysdeps/mach/hurd/opendir.c +++ b/sysdeps/mach/hurd/opendir.c @@ -110,8 +110,6 @@ __opendir (const char *name) if (dirp == NULL) __close (fd); - } - return dirp; } weak_alias (__opendir, opendir) |