Module Name: src
Committed By: martin
Date: Wed Dec 28 18:00:15 UTC 2022
Modified Files:
src/include [netbsd-10]: dirent.h
Log Message:
Pull up following revision(s) (requested by nia in ticket #28):
include/dirent.h: revision 1.38
scandir(3) and alphasort(3) are part of POSIX-2008, so don't require
_NETBSD_SOURCE to use them.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.2.1 src/include/dirent.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/dirent.h
diff -u src/include/dirent.h:1.37 src/include/dirent.h:1.37.2.1
--- src/include/dirent.h:1.37 Thu Dec 30 16:20:19 2021
+++ src/include/dirent.h Wed Dec 28 18:00:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dirent.h,v 1.37 2021/12/30 16:20:19 nros Exp $ */
+/* $NetBSD: dirent.h,v 1.37.2.1 2022/12/28 18:00:15 martin Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -108,19 +108,19 @@ long telldir(DIR *);
defined(_NETBSD_SOURCE)
#ifndef __LIBC12_SOURCE__
DIR *fdopendir(int);
-#endif
-#endif
-#if defined(_NETBSD_SOURCE)
-#ifndef __LIBC12_SOURCE__
-DIR *__opendir2(const char *, int) __RENAME(__opendir230);
int scandir(const char *, struct dirent ***,
int (*)(const struct dirent *), int (*)(const struct dirent **,
const struct dirent **))
__RENAME(__scandir30);
-int getdents(int, char *, size_t) __RENAME(__getdents30);
int alphasort(const struct dirent **, const struct dirent **)
__RENAME(__alphasort30);
#endif
+#endif
+#if defined(_NETBSD_SOURCE)
+#ifndef __LIBC12_SOURCE__
+DIR *__opendir2(const char *, int) __RENAME(__opendir230);
+int getdents(int, char *, size_t) __RENAME(__getdents30);
+#endif
#endif /* defined(_NETBSD_SOURCE) */
__END_DECLS
