diff options
| author | christos <christos@NetBSD.org> | 2005-09-14 20:20:15 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2005-09-14 20:20:15 +0000 |
| commit | 9d2cc4eaf5e9755f87f13f677014c76a19675974 (patch) | |
| tree | c497293eb0e5892a059e13a461b2b31839fac312 | |
| parent | 30cf53ba56b3a0c9eb67f62ed8161c096e3cf7ac (diff) | |
Fix opendir30 screwup and sort the compat defs for clarity.
| -rw-r--r-- | include/dirent.h | 3 | ||||
| -rw-r--r-- | lib/libc/compat/include/dirent.h | 19 |
2 files changed, 16 insertions, 6 deletions
diff --git a/include/dirent.h b/include/dirent.h index 81931ea2e6e..d2db05611bd 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -1,4 +1,4 @@ -/* $NetBSD: dirent.h,v 1.24 2005/09/13 01:44:32 christos Exp $ */ +/* $NetBSD: dirent.h,v 1.25 2005/09/14 20:20:15 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -88,7 +88,6 @@ int closedir(DIR *); void rewinddir(DIR *); #ifndef __LIBC12_SOURCE__ DIR *opendir(const char *) __RENAME(__opendir30); -DIR *__opendir30(const char *) __RENAME(__opendir30); struct dirent *readdir(DIR *) __RENAME(__readdir30); int readdir_r(DIR *, struct dirent * __restrict, struct dirent ** __restrict) __RENAME(__readdir_r30); diff --git a/lib/libc/compat/include/dirent.h b/lib/libc/compat/include/dirent.h index 7ed9ebedc35..4f81fde255e 100644 --- a/lib/libc/compat/include/dirent.h +++ b/lib/libc/compat/include/dirent.h @@ -1,4 +1,4 @@ -/* $NetBSD: dirent.h,v 1.1 2005/09/13 01:44:09 christos Exp $ */ +/* $NetBSD: dirent.h,v 1.2 2005/09/14 20:20:15 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -37,24 +37,35 @@ #include <compat/sys/dirent.h> __BEGIN_DECLS + DIR *opendir(const char *); -struct dirent12 *readdir(DIR *); +DIR *__opendir30(const char *); + int readdir_r(DIR *, struct dirent12 * __restrict, struct dirent12 ** __restrict); -struct dirent *__readdir30(DIR *); int __readdir_r30(DIR *, struct dirent * __restrict, struct dirent ** __restrict); + +struct dirent12 *readdir(DIR *); +struct dirent *__readdir30(DIR *); + #if defined(_NETBSD_SOURCE) + DIR *__opendir2(const char *, int); DIR *__opendir230(const char *, int); + int scandir(const char *, struct dirent12 ***, int (*)(const struct dirent12 *), int (*)(const void *, const void *)); int __scandir30(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const void *, const void *)); + int getdents(int, char *, size_t); -int getdirentries(int, char *, int, long *); int __getdents30(int, char *, size_t); + +int getdirentries(int, char *, int, long *); + #endif /* defined(_NETBSD_SOURCE) */ + __END_DECLS #endif /* !_COMPAT_DIRENT_H_ */ |
