From 74ca8d6f5d2e29bb7cf4606531313ee8c52b9eda Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Nov 2016 22:31:25 +0100 Subject: remove UCLIBC_HAS_LFS --- libc/misc/dirent/Makefile.in | 4 ++-- libc/misc/dirent/alphasort.c | 2 +- libc/misc/dirent/readdir.c | 2 +- libc/misc/dirent/readdir_r.c | 2 +- libc/misc/dirent/scandir.c | 2 +- libc/misc/dirent/versionsort.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libc/misc/dirent') diff --git a/libc/misc/dirent/Makefile.in b/libc/misc/dirent/Makefile.in index 5cae8d44d..90cdc25d4 100644 --- a/libc/misc/dirent/Makefile.in +++ b/libc/misc/dirent/Makefile.in @@ -11,8 +11,8 @@ CSRC := alphasort.c readdir.c scandir.c versionsort.c CSRC_R := readdir_r.c CSRC-y := closedir.c dirfd.c opendir.c rewinddir.c seekdir.c telldir.c $(CSRC) \ $(CSRC_R) -CSRC-$(UCLIBC_HAS_LFS) += $(patsubst %.c,%64.c,$(CSRC)) -CSRC-$(UCLIBC_HAS_LFS) += $(patsubst %_r.c,%64_r.c,$(CSRC_R)) +CSRC-y += $(patsubst %.c,%64.c,$(CSRC)) +CSRC-y += $(patsubst %_r.c,%64_r.c,$(CSRC_R)) MISC_DIRENT_DIR := $(top_srcdir)libc/misc/dirent MISC_DIRENT_OUT := $(top_builddir)libc/misc/dirent diff --git a/libc/misc/dirent/alphasort.c b/libc/misc/dirent/alphasort.c index 67b3b7859..de9bf4dfb 100644 --- a/libc/misc/dirent/alphasort.c +++ b/libc/misc/dirent/alphasort.c @@ -12,6 +12,6 @@ int alphasort(const struct dirent **a, const struct dirent **b) { return strcoll((*a)->d_name, (*b)->d_name); } -#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64 +#if __WORDSIZE == 64 strong_alias_untyped(alphasort,alphasort64) #endif diff --git a/libc/misc/dirent/readdir.c b/libc/misc/dirent/readdir.c index 75171064d..52fd26b62 100644 --- a/libc/misc/dirent/readdir.c +++ b/libc/misc/dirent/readdir.c @@ -56,7 +56,7 @@ all_done: return de; } libc_hidden_def(__READDIR) -#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64 +#if __WORDSIZE == 64 strong_alias_untyped(readdir,readdir64) libc_hidden_def(readdir64) #endif diff --git a/libc/misc/dirent/readdir_r.c b/libc/misc/dirent/readdir_r.c index 5beebfed0..04feac9c6 100644 --- a/libc/misc/dirent/readdir_r.c +++ b/libc/misc/dirent/readdir_r.c @@ -67,7 +67,7 @@ all_done: return((de != NULL)? 0 : ret); } libc_hidden_def(__READDIR_R) -#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64 +#if __WORDSIZE == 64 strong_alias_untyped(readdir_r,readdir64_r) libc_hidden_def(readdir64_r) #endif diff --git a/libc/misc/dirent/scandir.c b/libc/misc/dirent/scandir.c index c036ce59b..1f6c1ec9c 100644 --- a/libc/misc/dirent/scandir.c +++ b/libc/misc/dirent/scandir.c @@ -97,6 +97,6 @@ int __SCANDIR(const char *dir, __DIRENT_TYPE ***namelist, *namelist = names; return pos; } -#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64 +#if __WORDSIZE == 64 strong_alias_untyped(scandir,scandir64) #endif diff --git a/libc/misc/dirent/versionsort.c b/libc/misc/dirent/versionsort.c index 8e56ec56b..8129f7886 100644 --- a/libc/misc/dirent/versionsort.c +++ b/libc/misc/dirent/versionsort.c @@ -12,6 +12,6 @@ int versionsort(const struct dirent **a, const struct dirent **b) { return strverscmp((*a)->d_name, (*b)->d_name); } -#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64 +#if __WORDSIZE == 64 strong_alias_untyped(versionsort,versionsort64) #endif -- cgit v1.2.3