diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-03-14 16:17:38 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-03-17 21:08:51 -0500 |
| commit | d2937299fad043fa91cdf7f56eef914558be4077 (patch) | |
| tree | 52e6ad5760f6b7ef66d48e9ae60237639f7a01b0 | |
| parent | 575608b2021227f51beaf286cf71a27f4616cdcf (diff) | |
| download | cygnal-d2937299fad043fa91cdf7f56eef914558be4077.tar.gz cygnal-d2937299fad043fa91cdf7f56eef914558be4077.tar.bz2 cygnal-d2937299fad043fa91cdf7f56eef914558be4077.zip | |
Feature test macros overhaul: dirent.h
MAXNAMLEN is a BSDism.
Use the proper internal macros instead of !_POSIX_SOURCE. telldir and
seekdir are XSI, scandir and alphasort are POSIX.1-2008, and scandirat
is GNU.
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
| -rw-r--r-- | newlib/libc/include/dirent.h | 3 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/dirent.h | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/newlib/libc/include/dirent.h b/newlib/libc/include/dirent.h index 6fefc03cb..6135b9f6e 100644 --- a/newlib/libc/include/dirent.h +++ b/newlib/libc/include/dirent.h @@ -3,9 +3,10 @@ #ifdef __cplusplus extern "C" { #endif +#include <sys/cdefs.h> #include <sys/dirent.h> -#if !defined(MAXNAMLEN) && !defined(_POSIX_SOURCE) +#if !defined(MAXNAMLEN) && __BSD_VISIBLE #define MAXNAMLEN 1024 #endif diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h index 46c34ab5e..dd026178b 100644 --- a/winsup/cygwin/include/sys/dirent.h +++ b/winsup/cygwin/include/sys/dirent.h @@ -12,6 +12,7 @@ #ifndef _SYS_DIRENT_H #define _SYS_DIRENT_H +#include <sys/cdefs.h> #include <sys/types.h> #include <limits.h> @@ -72,22 +73,28 @@ int closedir (DIR *); int dirfd (DIR *); -#ifndef _POSIX_SOURCE +#if __MISC_VISIBLE || __XSI_VISIBLE #ifndef __INSIDE_CYGWIN__ long telldir (DIR *); void seekdir (DIR *, long loc); #endif +#endif +#if __MISC_VISIBLE || __POSIX_VISIBLE >= 200809 int scandir (const char *__dir, struct dirent ***__namelist, int (*select) (const struct dirent *), int (*compar) (const struct dirent **, const struct dirent **)); +int alphasort (const struct dirent **__a, const struct dirent **__b); +#endif +#if __GNU_VISIBLE int scandirat (int __dirfd, const char *__dir, struct dirent ***__namelist, int (*select) (const struct dirent *), int (*compar) (const struct dirent **, const struct dirent **)); +#endif -int alphasort (const struct dirent **__a, const struct dirent **__b); +#if __BSD_VISIBLE #ifdef _DIRENT_HAVE_D_TYPE /* File types for `d_type'. */ enum @@ -116,5 +123,5 @@ enum # define IFTODT(mode) (((mode) & 0170000) >> 12) # define DTTOIF(dirtype) ((dirtype) << 12) #endif /* _DIRENT_HAVE_D_TYPE */ -#endif /* _POSIX_SOURCE */ +#endif /* __BSD_VISIBLE */ #endif /*_SYS_DIRENT_H*/ |