diff options
| author | Jakob Kaivo <jkk@ung.org> | 2020-08-17 11:36:30 -0400 |
|---|---|---|
| committer | Jakob Kaivo <jkk@ung.org> | 2020-08-17 11:36:30 -0400 |
| commit | f48efbd44aeb1f0c71666e1b7866ab4a83a98acf (patch) | |
| tree | 5dd2e2eb73b222ceb2e3d338b4dbeba99d05dd03 | |
| parent | 73da506ee04ec490c5959b45c216a1f8508bec5b (diff) | |
move conditional definitons to _dirent.h
| -rw-r--r-- | src/dirent/_dirent.h | 12 | ||||
| -rw-r--r-- | src/dirent/opendir.c | 8 | ||||
| -rw-r--r-- | src/dirent/readdir.c | 4 |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/dirent/_dirent.h b/src/dirent/_dirent.h index 14af64ff..8b144316 100644 --- a/src/dirent/_dirent.h +++ b/src/dirent/_dirent.h @@ -1,7 +1,17 @@ #ifndef ___DIRENT_H__ #define ___DIRENT_H__ -#include <dirent.h> +#ifndef O_DIRECTORY +#define O_DIRECTORY O_RDONLY +#endif + +#ifndef O_SEARCH +#define O_SEARCH O_RDONLY +#endif + +#ifndef NAME_MAX +#define NAME_MAX _POSIX_NAME_MAX +#endif struct __DIR { int fd; diff --git a/src/dirent/opendir.c b/src/dirent/opendir.c index 31d9445c..8ab8f190 100644 --- a/src/dirent/opendir.c +++ b/src/dirent/opendir.c @@ -5,14 +5,6 @@ #include <fcntl.h> #include "_dirent.h" -#ifndef O_DIRECTORY -#define O_DIRECTORY O_RDONLY -#endif - -#ifndef O_SEARCH -#define O_SEARCH O_RDONLY -#endif - DIR * opendir(const char * dirname) { DIR *dir = malloc(sizeof(*dir)); diff --git a/src/dirent/readdir.c b/src/dirent/readdir.c index 0ccbe790..7ca7c55f 100644 --- a/src/dirent/readdir.c +++ b/src/dirent/readdir.c @@ -7,10 +7,6 @@ #include "_dirent.h" #include "_syscall.h" -#ifndef NAME_MAX -#define NAME_MAX _POSIX_NAME_MAX -#endif - /** read a directory **/ struct dirent * readdir(DIR * dirp) |