JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Feature test macros overhaul: dirent.h

Browse Source 
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>
This commit is contained in:
Yaakov Selkowitz 2016-03-14 16:17:38 -05:00
parent 575608b202
commit d2937299fa
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
newlib/libc/include/dirent.h
View File

@ -3,9 +3,10 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <sys/cdefs.h>
#include <sys/dirent.h> #include <sys/dirent.h>
#if !defined(MAXNAMLEN) && !defined(_POSIX_SOURCE) #if !defined(MAXNAMLEN) && __BSD_VISIBLE
#define MAXNAMLEN 1024 #define MAXNAMLEN 1024
#endif #endif

13
winsup/cygwin/include/sys/dirent.h
View File

@ -12,6 +12,7 @@
#ifndef _SYS_DIRENT_H #ifndef _SYS_DIRENT_H
#define _SYS_DIRENT_H #define _SYS_DIRENT_H
#include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
#include <limits.h> #include <limits.h>
@ -72,22 +73,28 @@ int closedir (DIR *);
int dirfd (DIR *); int dirfd (DIR *);
#ifndef _POSIX_SOURCE #if __MISC_VISIBLE || __XSI_VISIBLE
#ifndef __INSIDE_CYGWIN__ #ifndef __INSIDE_CYGWIN__
long telldir (DIR *); long telldir (DIR *);
void seekdir (DIR *, long loc); void seekdir (DIR *, long loc);
#endif #endif
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE >= 200809
int scandir (const char *__dir, int scandir (const char *__dir,
struct dirent ***__namelist, struct dirent ***__namelist,
int (*select) (const struct dirent *), int (*select) (const struct dirent *),
int (*compar) (const struct dirent **, 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 scandirat (int __dirfd, const char *__dir, struct dirent ***__namelist,
int (*select) (const struct dirent *), int (*select) (const struct dirent *),
int (*compar) (const struct dirent **, 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 #ifdef _DIRENT_HAVE_D_TYPE
/* File types for `d_type'. */ /* File types for `d_type'. */
enum enum
@ -116,5 +123,5 @@ enum
# define IFTODT(mode) (((mode) & 0170000) >> 12) # define IFTODT(mode) (((mode) & 0170000) >> 12)
# define DTTOIF(dirtype) ((dirtype) << 12) # define DTTOIF(dirtype) ((dirtype) << 12)
#endif /* _DIRENT_HAVE_D_TYPE */ #endif /* _DIRENT_HAVE_D_TYPE */
#endif /* _POSIX_SOURCE */ #endif /* __BSD_VISIBLE */
#endif /*_SYS_DIRENT_H*/ #endif /*_SYS_DIRENT_H*/