diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-27 22:31:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-27 22:32:11 +0100 |
| commit | 74ca8d6f5d2e29bb7cf4606531313ee8c52b9eda (patch) | |
| tree | b2e5ad49c4499ca7c21a92e4d4c3e3aced7cb524 /libc/misc/glob | |
| parent | d9f4c6bb0568da6d80f60a0040354f45478f84a3 (diff) | |
remove UCLIBC_HAS_LFS
Diffstat (limited to 'libc/misc/glob')
| -rw-r--r-- | libc/misc/glob/Makefile.in | 2 | ||||
| -rw-r--r-- | libc/misc/glob/glob-susv3.c | 8 | ||||
| -rw-r--r-- | libc/misc/glob/glob.c | 6 |
3 files changed, 3 insertions, 13 deletions
diff --git a/libc/misc/glob/Makefile.in b/libc/misc/glob/Makefile.in index c89d2b08d..a3f952067 100644 --- a/libc/misc/glob/Makefile.in +++ b/libc/misc/glob/Makefile.in @@ -9,7 +9,7 @@ subdirs += libc/misc/glob VARIANT := $(if $(UCLIBC_HAS_GNU_GLOB),,-susv3) CSRC-y := glob$(VARIANT).c -CSRC-$(UCLIBC_HAS_LFS) += glob64$(VARIANT).c +CSRC-y += glob64$(VARIANT).c MISC_GLOB_DIR := $(top_srcdir)libc/misc/glob MISC_GLOB_OUT := $(top_builddir)libc/misc/glob diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c index 59b4d8e5f..bdece2a91 100644 --- a/libc/misc/glob/glob-susv3.c +++ b/libc/misc/glob/glob-susv3.c @@ -6,9 +6,7 @@ #include <features.h> -#ifdef __UCLIBC_HAS_LFS__ -# define BUILD_GLOB64 -#endif +#define BUILD_GLOB64 #include <glob.h> #include <fnmatch.h> @@ -39,14 +37,10 @@ extern int __glob_sort(const void *a, const void *b) attribute_hidden; extern int __glob_match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(const char *path, int err), struct match **tail) attribute_hidden; #endif -#ifdef __UCLIBC_HAS_LFS__ # define stat stat64 # define readdir_r readdir64_r # define dirent dirent64 # define struct_stat struct stat64 -#else -# define struct_stat struct stat -#endif /* keep only one copy of these */ #ifndef __GLOB64 diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c index 923c03538..c4ecf678b 100644 --- a/libc/misc/glob/glob.c +++ b/libc/misc/glob/glob.c @@ -49,11 +49,7 @@ #define globfree(pglob) globfree64 (pglob) #else #define __readdir readdir -#ifdef __UCLIBC_HAS_LFS__ #define __readdir64 readdir64 -#else -#define __readdir64 readdir -#endif #define struct_stat64 struct stat #define __stat64(fname, buf) stat (fname, buf) #endif @@ -341,7 +337,7 @@ static int glob_in_dir (const char *pattern, const char *directory, int flags, { const char *name; size_t len; -#if defined __UCLIBC_HAS_LFS__ && !defined COMPILE_GLOB64 +#if !defined COMPILE_GLOB64 struct dirent64 *d; union { |