aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-10-14 21:11:09 +0000
committerUlrich Drepper <drepper@redhat.com>2005-10-14 21:11:09 +0000
commit18b8e054cf34f78f100b74b37e54673730530249 (patch)
tree9a05507b0557ed4c0b7f08549903e069d026f863 /include
parentf9126cc23e355dcad375942312e7068b44740d6c (diff)
downloadglibc-18b8e054cf34f78f100b74b37e54673730530249.zip
glibc-18b8e054cf34f78f100b74b37e54673730530249.tar.gz
glibc-18b8e054cf34f78f100b74b37e54673730530249.tar.bz2
* sysdeps/unix/opendir.c (__opendir): Pass extra argument to
__alloc_dir. (__alloc_dir): Only close descriptor on error if new parameter is true. * sysdeps/unix/fdopendir.c (fdopendir): Pass extra argument to __alloc_dir. Don't close fd on error. * include/dirent.h (__alloc_dir): Adjust prototype. * include/sys/mman.h (__mremap): Add ellipsis. * malloc/memusage.c: Adjust mremap wrapper for optional additional parameter.
Diffstat (limited to 'include')
-rw-r--r--include/dirent.h3
-rw-r--r--include/sys/mman.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/dirent.h b/include/dirent.h
index b040a04..81ad24d 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -24,5 +24,6 @@ extern int __alphasort64 (const void *a, const void *b)
__attribute_pure__;
extern int __versionsort64 (const void *a, const void *b)
__attribute_pure__;
-extern DIR *__alloc_dir (int fd, struct stat64 *statp) internal_function;
+extern DIR *__alloc_dir (int fd, bool close_fd, struct stat64 *statp)
+ internal_function;
#endif
diff --git a/include/sys/mman.h b/include/sys/mman.h
index 14e7578..8c07a4e 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -11,5 +11,5 @@ extern int __mprotect (void *__addr, size_t __len, int __prot);
/* This one is Linux specific. */
extern void *__mremap (void *__addr, size_t __old_len,
- size_t __new_len, int __may_move);
+ size_t __new_len, int __flags, ...);
#endif